[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.10-22-gcd3fe1d

Tue Sep 22 05:22:13 CEST 2015

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.18.x has been updated
       via  cd3fe1d79e847deef117c4a4254e6591e3d2de9f (commit)
       via  f665e17eb419509822afba80b86c1847eb726dca (commit)
       via  40c225904281e93c37cc993ef0cc65710af54813 (commit)
       via  9ceb3957b2344145c3639a333bfd3a6320d91d4b (commit)
       via  86c01c0fb58cba149233578264892d5bfca52d16 (commit)
       via  3197f45c2b7d47d50d78f612461761b37fefa8ba (commit)
       via  5248f73a39a2730ff4f47469961aefa4944d3bdd (commit)
      from  2727146bdee89c7ee7b910ca2afda6fef72f21bc (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 cd3fe1d79e847deef117c4a4254e6591e3d2de9f
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Aug 26 10:54:30 2015 +0200

    Bug 14766: Complete cataloguing plugin unimarc_field_4XX

    Add subfields l, n and o for better UNIMARC compliance

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

    Note: I just did a code audit here, as I don't know enough about
    UNIMARC to know if the 4XX fields should have these subfields.

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 503dd6036974b4208bd5cd60a87bb28599987f45)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 84ee44110a934632ddcc8da59aa805c45a79786e)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit f665e17eb419509822afba80b86c1847eb726dca
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jul 14 13:12:46 2015 +0100

    Bug 11273: FIX barcode generation in acquisition if hbyymmincr

    When AutoBarcode is activated and you have set AcqCreateItem to 'on
    order' there is a Javascript error when you try to generate a barcode
    for the item:

    TypeError: document.f is undefined
    http://localhost:8080/intranet-tmpl/lib/jquery/jquery.js
    Line 11

    Test plan:
    0/ a. Set AutoBarcode to hbyymmincr
       b. Set AcqCreateItem to 'on ordering'
       c. Set the plugin barcode.pl to the barcode field for the default
       and the ACQ frameworks
    1/ Go on the add items page (cataloguing/additem.pl) and confirm that
    the plugin works as expected.
    2/ Go on the New order page (acqui/neworderempty.pl) and confirm that
    the plugin works as expected.

    Followed test plan, works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 5b521eb394771ee305777f0b44098be5fdd11cc7)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 272650cb3f1e2d3ac24559ede0049b263b829762)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 40c225904281e93c37cc993ef0cc65710af54813
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jul 14 18:07:37 2015 +0100

    Bug 14354: Prevent edition of items from other branches if IndependentBranches is on

    If IdependentBranches is ON, to edit/delete items from other branches
    you need to be superlibrarian.
    Currently a "simple" staff user cannot edit them from the edit item page
    but from the catalogue detail page.

    The edit links should not be displayed on this table.

    Test plan:
    O/ Set IndependentBranches to "Prevent".
    Create a record and add 2 items:
       Set homebranch to L1 for item I1.
       Set homebranch to L2 for item I2.
    1/ With a superlibrarian user, you should be able to edit both items.
    2/ With a "simple" user attached to L1, you should only be able to edit
    I1. The edit links should not be displayed for I2.

    Note that the checkbox is displayed on the catalogue detail page (item
    list), but on the batch tools, it won't be possible to select non-modifiable
    items.

    TODO: Add a server-side check. Indeed it is still possible to edit an
    item if the user know the url.

    Followed test plan. Works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit bcab2416399e93f5ce9b1083395c052046d5d02a)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 28fe340ea75475903a1063f734dec45781d35f90)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 9ceb3957b2344145c3639a333bfd3a6320d91d4b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Sep 2 15:07:07 2015 +0100

    Bug 11247: Improve tests

    This patch makes the tests non dependent on the DB and test the 3 marc
    flavours.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 6e0b61e2acea7c797c1da727474daf7d7a657574)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 27ba1a6fa1a5be170d9bf04747f31caab15766b1)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 86c01c0fb58cba149233578264892d5bfca52d16
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Aug 26 14:09:53 2015 +0200

    Bug 11247: Add a simple unit test for TransformHtmlToXml

    The unit test is db dependent (as Jonathan correctly remarked),
    since the sub checks a preference.

    Test plan:
    Run t/db_dependent/Biblio/TransformHtmlToXml.t

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit d1335a766d7b54c470701b0055fc99be2e7e7628)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 74e46b7467aa69e5a77d0b7689ddd2d24d76805d)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 3197f45c2b7d47d50d78f612461761b37fefa8ba
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 18 18:40:31 2015 +0100

    Bug 14584: Encoding broken with system preferences

    The pref are double encoded.

    From bug 12411:
    "This will fix the encoding issues existing in 3.14 and 3.16.
    The issue still appear in master but is fixed by bug 11944."

    They should not have been pushed together.

    Test plan:
    1) You need an accentuated language installed.
    2) Go to NoLoginInstructions pref, and add some accentuated message like
    "Hélo médames é mècieüx"
    3) refresh opac home page, message should be gibberish
    4) apply patch.  Message should be ok now.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Works as expected.

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 813a047e236947a815c4be3c3dde38f19844b962)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit 270187404e87bdae985e70a590834ed2dc5d49c7)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 5248f73a39a2730ff4f47469961aefa4944d3bdd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Jul 10 16:11:48 2015 +0100

    Bug 12965: Prevent to erase an existing item type

    On creating an item type, if it already exists, it will replace the
    existing one.
    This patch prevent that and display a message to the interface.

    Note: The fields are lost.

    Test plan:
    1/ Create an item type 'AAA', description 'AAA'
    2/ Edit it, update the description with 'BBB'
    3/ Create an item type 'AAA' with a description 'CCC' => you should get
    a warning "already exists".

    Works well, no errors

    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Warning message is triggered.
    Adding, editing and deleting item types still works.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    (cherry picked from commit eb12ee1e223b662cd1e89c0a56a5d1c083ba1ddc)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 C4/Barcodes/ValueBuilder.pm                        |   10 ++-
 Koha/Template/Plugin/Koha.pm                       |    3 +-
 admin/itemtypes.pl                                 |   38 ++++++----
 catalogue/detail.pl                                |    9 ++-
 cataloguing/value_builder/unimarc_field_4XX.pl     |   18 +++++
 .../prog/en/modules/admin/itemtypes.tt             |   16 ++++
 .../prog/en/modules/catalogue/detail.tt            |    7 +-
 .../cataloguing/value_builder/unimarc_field_4XX.tt |    9 +++
 t/Biblio/TransformHtmlToXml.t                      |   80 ++++++++++++++++++++
 9 files changed, 166 insertions(+), 24 deletions(-)
 create mode 100644 t/Biblio/TransformHtmlToXml.t

hooks/post-receive
-- 
main Koha release repository