[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.04-38-geba89b7

Sun Mar 31 04:01:41 CEST 2013

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.10.x has been updated
       via  eba89b7430b882f6b4e135a4877240f7eb666635 (commit)
       via  8c86250d453929d79a3a487b80f5a2599e7534f1 (commit)
       via  500d8c360247f79f1d61d36a731f6776143558ba (commit)
       via  ac81f4516f774da6200609a900c3118e1d44776a (commit)
      from  b1ed724f8fadfc9185d497a4884cdf4a3f12db2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eba89b7430b882f6b4e135a4877240f7eb666635
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Mar 28 15:37:26 2013 +0100

    Bug 9945: Changed display: inline to inline-block on the inline CSS styling on the li elements.

    When adding/modifying an authorised values.

    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Improves icon set display in authorised value configuration.
    CSS only.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 8c86250d453929d79a3a487b80f5a2599e7534f1
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Fri Mar 29 13:08:05 2013 +0100

    Bug 9953 - When OpacMaintenance breaks lifting debarment

    When OpacMaintenance is on, any opac page will redirect to maintenance.pl.
    Some pages of intranet have the same behavior and you get 404 error.
    This is because in checkauth, if type arg is undefined it is "opac" by default.

    This patch adds type arg in all intranet calls of checkauth.

    Test plan :
    - Set syspref OpacMaintenance=Show
    - Go to a borrower page
    - Click on "Fines" and "Create manual invoice"
    - Enter an amount and save
    => Check you go to members/boraccount.pl and not maintenance.pl with 404 error

    OK

    - Click on "Fines" and "Create manual credit"
    - Enter an amount and save
    => Check you go to members/boraccount.pl and not maintenance.pl with 404 error

    OK

    - Edit borrower
    - Set "Restricted" to yes and save
    - Click on "Lift restriction" in messages
    => Check you keep in member page and not maintenance.pl with 404 error

    OK

    - Edit borrower
    - Set "Expiry date" to a day in the past and save
    - Click on "Renew" in messages
    => Check you keep in member page and not maintenance.pl with 404 error

    OK

    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    Good catch, a tricky bug.
    http://bugs.koha-community.org/show_bug.cgi?id=9952

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Removed a few tabs from mancredit.
    All tests and QA script pass now.
    Good test plan.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 500d8c360247f79f1d61d36a731f6776143558ba
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Tue Mar 5 11:39:54 2013 +1300

    Bug 9745 - don't nuke translated strings in permissions on DB upgrade

    To test:

    (this is best done by someone who has a database with translated
    strings for user permissions - I'm looking towards Katrin. :))

    Get a 3.6-3.8 era database loaded as test data - also please use
    a low value test database.

    Translate or change the strings in the database for the user
    permissions that follow in mysql client (for those who didn't
    install with a different language that has translated files
    at install time) -

    update userflags set flagdesc="Translated text 1" where flag
    IN('catalogue','editauthorities','reports','management','serials',
    'updatecharges','circulate','parameters','borrowers','tools',
    'staffaccess','edit_patrons');
    (you will notice that this changes all of the permission labels
    in the interface to "translated text 1" for the affected
    permission flags. This is why I don't want you to use a high
    value test database.)

    Update that to master + this patch - your "translations"
    should be intact.

    Blow that database away, and make a brand new one 3.6-3.8 era
    with the english database definitions. Run the update again with
    this patch, the strings should be updated correctly.

    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    There was a typo in the patch, the first database update had to be
    changed from this: $dbh->do{(q{ to this: $dbh->do(q{

    * Test 1:
    - git checkout v3.06.05
    - Run through the web installer in Norwegian, installing all
      Norwegian sample data
    - git checkout <master + patch for bug 9745>
    - Run web installer/upgrade
    - Almost all of the permissions are still in Norwegian. The ones
      that are in English are not touched by the database update for
      3.11.00.016, so they must have been introduced by other updates.

    * Test 2:
    - git checkout v3.06.05
    - Run through the web installer in English, installing all English
      sample data
    - git checkout <master + patch for bug 9745>
    - Run web installer/upgrade
    - All permissions have been updated as expected, except "Perform
      batch modification of patrons" which is not in the 'userflags'
      table, but in the 'permissions' table. I have amended the patch
      to account for this.

    Two fixes to the original patch, please give a shout if this
    makes a second signoff necessary!

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    I tested this on an English and a German sample base updating
    from 3.06.07 successfully.

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Corrected incorrect field names in the last query (it's
    permissions.description not permissions.flagdesc).

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit ac81f4516f774da6200609a900c3118e1d44776a
Author: Jen Zajac <jen at catalyst.net.nz>
Date:   Mon Mar 25 16:49:36 2013 +1300

    Bug 5648: Changed display: inline to inline-block on the inline CSS styling on the li elements.

    Signed-off-by: Frédéric Durand <frederic.durand at unilim.fr>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 installer/data/mysql/updatedatabase.pl             |   26 ++++++++++----------
 .../prog/en/modules/admin/authorised_values.tt     |    2 +-
 .../prog/en/modules/admin/itemtypes.tt             |    2 +-
 members/mancredit.pl                               |    7 +++--
 members/maninvoice.pl                              |    5 ++-
 members/member-password.pl                         |    2 +-
 members/setdebar.pl                                |    5 +---
 members/setstatus.pl                               |    4 +--
 8 files changed, 25 insertions(+), 28 deletions(-)

hooks/post-receive
-- 
main Koha release repository