[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.05.1-37-ge668651

[Git repo owner]

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  e66865142ed66c3d74b985ee75fac0dad8f9fc21 (commit)
       via  8347a82bbfee7b2ba6cb2e7335676aff6d199fd6 (commit)
       via  1206d13fd9392f8d944ef191634738ad8ee21ed3 (commit)
       via  5c14b7ba9c53f784f7b42f24f0755d60909ab3f9 (commit)
       via  6d2322138cfd5d30e63377251428dba6d5685e23 (commit)
      from  995cb6fecf11f8951ffa706d1909c4aea94d33f3 (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 e66865142ed66c3d74b985ee75fac0dad8f9fc21
Merge: 8347a82 995cb6f
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Apr 3 09:50:25 2015 +1300

    Merge branch '3.18.x' of git://git.koha-community.org/koha into 3.18.x

commit 8347a82bbfee7b2ba6cb2e7335676aff6d199fd6
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Mar 25 15:51:00 2015 +0100

    Bug 3873: follow-up for all other pages
    
    This should fix the issue on other pages.
    
    Test plan:
    Try to download and export the basket (intranet+opac sides).
    
    Re-tested for errors in comment #5, they do not longer appear.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 3adddd3410acf45874b7a154c2700f3f4b2e7f4b)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 1206d13fd9392f8d944ef191634738ad8ee21ed3
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Mar 25 09:39:02 2015 +0100

    Bug 3873: Avoid software error if the cart contains a deleted record
    
    If a record is placed in the basket and deleted, the basket view
    exploded with:
    Can't use an undefined value as an ARRAY reference at
    /home/koha/src/basket/basket.pl line 73.
    
    Test plan:
    1/ Add some records to the basket
    2/ Delete one of them
    3/ Look at your basket
    It should not exploded
    
    Note that the number of items in the basket is now wrong.
    
    Works as expected.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 4c4c870dfee59ebe6386dbd8a7b75a55f75217f9)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 5c14b7ba9c53f784f7b42f24f0755d60909ab3f9
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Mar 26 10:23:26 2015 +0100

    Bug 5844: Avoid strings cut on unhighlighing
    
    If a user is searching for several words and that one is contained in
    another ( "mag ma" ), some characters are cut (removed from the DOM!).
    
    To reproduce:
    1/ search for "mag ma m"
    2/ The result page contains "Magazine"
    3/ "Mag" is highlighted
    4/ Click on the "Unhighlight" link
    5/ The "Magazine" words become "azine", "Mag" has been cut.
    There is no way to show these characters again.
    
    Test plan:
    1/ Confirm the bad behavior without this patch
    2/ Apply this patch
    3/ search for "mag ma m"
    4/ The result page contains "Magazine"
    5/ "Mag" is highlighted
    6/ Click on the "Unhighlight" link
    7/ strings are unhighlighted and still in the DOM :)
    
    Note that the Highlight link won't work very well (only "a" will be
    highlighted, but considered as minor since this did not work before the
    patch neither).
    
    Followed test plan. Strings are no longer cut when unhiglighted.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 2e4b574074ad8f66908cd22b466ba7a991696686)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 6d2322138cfd5d30e63377251428dba6d5685e23
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Mar 24 17:30:02 2015 +0100

    Bug 3969: Fix funds search
    
    The funds search does not work at all.
    On the budget and the budget plan page, the library dropdown list is
    empty.
    
    Test plan:
    On the budget, the budget plan and the fund pages, confirm that you are
    able to search a fund by code (or name) and the library dropdown list is
    correctly filled.
    
    Tested with several combinations. Works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Tested various combinations, no problems found.
    Passes tests and QA script.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 934de70eec747f901904721fc12024051cf52f4c)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 admin/aqbudgetperiods.pl                             |    3 +++
 admin/aqbudgets.pl                                   |   18 ++++++------------
 admin/aqplan.pl                                      |    4 +++-
 basket/basket.pl                                     |    1 +
 basket/downloadcart.pl                               |    1 +
 basket/sendbasket.pl                                 |    1 +
 .../lib/jquery/plugins/jquery.highlight-3.js         |    8 ++------
 opac/opac-basket.pl                                  |    1 +
 opac/opac-sendbasket.pl                              |    1 +
 9 files changed, 19 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
main Koha release repository