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

Tue Sep 22 04:25:38 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  2727146bdee89c7ee7b910ca2afda6fef72f21bc (commit)
       via  9d2046b285b9dccead3eb494b006743bf7397431 (commit)
       via  c7d4daddf4682eceac3a3eef502a0de15646dca0 (commit)
       via  6c5fae2a15ad6bda734a22a433926385b0207a3c (commit)
      from  a14cc8fdc8bdcc3b9f7080c047ff85d839559886 (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 2727146bdee89c7ee7b910ca2afda6fef72f21bc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jul 15 12:49:03 2015 +0100

    Bug 12885: Fix if url contains +*... and HTML5 Media is enabled

    The special regex chars are not escaped in C4::HTML5Media.

    Test plan:
    1/ Set 856$u=http://www.mrqe.com/lookup?talented+mr.+ripley
    2/ Enable the pref HTML5Media
    3/ Go on the detail page
    It should not explode.

    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>

    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 085d766a0524e399d0c9c9e807d8c0acd0da6a19)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 9d2046b285b9dccead3eb494b006743bf7397431
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 13 17:34:53 2015 +0100

    Bug 13943: Prevent the deletion of items if the user cancels

    On the edit items page, there is some weird JS code: if the user clicks
    on the delete link and then cancel, the item is deleted anyway.

    It's caused by the following JS code in browser.js
      $('a[href*="biblionumber="]').click(function (ev) {
          ev.preventDefault();
          window.location = $(this).attr('href') + '&searchid=' + me.searchid;
      });

    Test plan:
    - Do a search with multiple results
    - Go to the detail page (make sure results browser shows up!)
    - Use the "Edit items" link from the toolbar
    - Delete an item (try both way)
    - Choose "cancel"
    - Delete an item (try both way) and confirm the deletion
    You should see the browser after the deletion and the item should have
    been deleted correctly.
    - Edit an item (try both way)
    You should see the browser (did not work before this patch)

    Note: Before this patch, the 2 first columns didn't contain the
    edit/delete item links, now it's only the 1st one.

    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Much better!
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

commit c7d4daddf4682eceac3a3eef502a0de15646dca0
Author: Srdjan <srdjan at catalyst.net.nz>
Date:   Thu Nov 14 19:10:30 2013 +1300

    Bug 11247: Fix calls of TransformHtmlToXml

    The ind_tag of TransformHtmlToXml is unused.
    Some calls to this function incorrectly revert indicator and ind_tag (which
    is not a problem when both are empty..)

    Patch of Srdjan Jankovic, amended and signed off by Marcel de Rooy.

    The following calls are fixed:
    call in acqui/addorder.pl: switched indicator with ind_tag
    call in acqui/addorderiso2709.pl replaced too
    acqui/finishreceive.pl replaced too

    These calls are fine:
    two calls in cataloguing/additem.pl are fine
    call in serials/serials-edit.pl is fine
    call in tools/batchMod.pl is fine

    The folllow-up patch adds a simple unit test.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    With AcqCreateItem=='placing an order', tested if adding an order still
    worked (covered both addorder.pl and addorderiso2709.pl).

    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 22b41063981de608402d1dd87f6aa9e2010245dd)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 6c5fae2a15ad6bda734a22a433926385b0207a3c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 19 16:24:32 2015 +0100

    Bug 14696: useless use of String::Random in catalogue/search.pl

    Bug 10404 adds the use of String::Random to catalogue/search.pl but bug
    11369 removes it without removing the import line.

    Test plan:
      git grep String::Random catalogue/search.pl
    should not return anything

    Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>

    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 90285259e898f4734684edf10a64c252a180fdf6)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 C4/Biblio.pm                                       |    2 +
 C4/HTML5Media.pm                                   |    2 +-
 acqui/addorder.pl                                  |    2 +-
 acqui/addorderiso2709.pl                           |    2 +-
 acqui/finishreceive.pl                             |    3 +-
 catalogue/search.pl                                |    1 -
 .../prog/en/modules/cataloguing/additem.tt         |   52 +++++++++++---------
 7 files changed, 36 insertions(+), 28 deletions(-)

hooks/post-receive
-- 
main Koha release repository