[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.03-42-g073ac1a

[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  073ac1abd26cf877f5a383197b38254d1be30ca5 (commit)
       via  21d420b8810ac4ad3d33d0f678ea94109fa703e7 (commit)
       via  eb1ca95054f8deb1268c8cc6ef798fed1929a710 (commit)
       via  74a5fb4fbdb96253605244707da462a11cae8f98 (commit)
       via  fb2669673dab127e7ad1d191bc1f9d53bbb5ae7b (commit)
      from  1120246a818e16af04cf155984fec7c44b5ed47c (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 073ac1abd26cf877f5a383197b38254d1be30ca5
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Nov 5 12:41:13 2014 +0100

    Bug 13201: GetSuggestion takes suggestionid
    
    Having $ordernumber as the parameter in a function which is
    handling suggestions and it is used as a suggestion id is
    confusing to the coder and person trying to read the code.
    This patch corrects the confusion.
    
    REVISED TEST PLAN
    -----------------
    1) perldoc C4::Suggestions
       -- notice it says ordernumber for the GetSuggestions example.
    2) Ensure you have CPL in your branches table.
    3) prove -v t/db_dependent/Suggestions.t
       -- if you have more than 8 itemtypes in your database, two
          tests at the end will fail, but that is not relevant to
          the modified GetSuggestions code.
    4) apply patch
    5) perldoc C4::Suggestions
       -- notice it is corrected now.
    6) prove -v t/db_dependent/Suggestions.t
       -- it should run with the same results as in step 3.
          That is, if you have 8 itemtypes, all pass, otherwise
          those two tests fail.
    7) run koha qa test tool
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit ddf909ae24df5a3185370f5c4916135bb94b67ae)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 21d420b8810ac4ad3d33d0f678ea94109fa703e7
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Feb 9 09:26:04 2015 +0100

    Bug 13404: [QA Follow-up] Minor rewording of some warnings
    
    Changes are confirmed with author (Mirko Tietgen). See Bugzilla.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 09edfe8d53f91d150c39be9ec41bc24c82ce93dd)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit eb1ca95054f8deb1268c8cc6ef798fed1929a710
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jan 1 21:06:58 2015 -0500

    Bug 13404 [QA Followup]
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 983f49d7b28e3bf65c799f7ff00d64bdb10429d0)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 74a5fb4fbdb96253605244707da462a11cae8f98
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date:   Sun Dec 7 18:39:51 2014 +0100

    Bug 13404 - More System information about GRS1 vs DOM settings
    
    System information indicates missing <zebra_bib_index_mode> and <zebra_auth_index_mode> entries in koha-conf.xml.
    
    This patch
    
    - adds warnings about a possible mismatch between these settings and the actual setup
    - adds info about the actual setup/what values to use for <zebra_bib_index_mode> and <zebra_auth_index_mode> if they are not set.
    
    The assumption is that a path including 'zebra-*-dom.cfg' in the respective section indicates a DOM setup.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 6a68ac3e5ded2e56d9b9de8f6e1a6a9ed49ac327)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit fb2669673dab127e7ad1d191bc1f9d53bbb5ae7b
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri Dec 5 15:50:05 2014 +0100

    Bug 13401 - sort branches alphabetically in admin/authorised_values.pl
    
    This patch adds a sort of branches alphabetically by name in authorised values administration, like in many other pages.
    
    Also replaces var $branch (too ambigus) by $branchcode.
    
    Test plan :
    - Create 2 branches : code=AAA,name=Zbranch and code=ZZZ,name=Abranch
    - Create a new authorized value : admin/authorised_values.pl
    - Look at "Libraries limitation" :
    => Without patch branches are sorted by code : Zbranch then Abranch
    => Without patch branches are sorted by name : Abranch then Zbranch
    - Select a branch and save
    - Re-edit
    => Check the same branch is selected
    
    Followed test plan. Patch behaves 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 b6aae39c263eee482aaeb574c206fa0c2c69f120)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Suggestions.pm                                |    8 ++--
 about.pl                                         |   46 ++++++++++++++++++++++
 admin/authorised_values.pl                       |    8 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |   30 ++++++++++++++
 4 files changed, 84 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository