[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.07-39-g0ba2ce0

Git repo owner gitmaster at git.koha-community.org
Fri Jan 19 14:34:08 CET 2018


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, 17.05.x has been updated
       via  0ba2ce047b58f92aaef74380c8e10afbc33970cb (commit)
       via  1176b2e8f1fd1763e3074c8b01e1cfa31559b564 (commit)
       via  1394d78f50a9d63af8e3b170bf2949f88fce3197 (commit)
       via  5a6eae13bfcb7cf08b9b278fcc97a937afd571ec (commit)
       via  cdf608606fb35074acfe15d770fc36d395471bcb (commit)
       via  93b3cbff26680ca94534604b04bd99edfa6911b1 (commit)
       via  e134b6768bb1da3e3af31b9b83c77f9ab78ffb83 (commit)
      from  d17012973e117c5ffdbc62c27ef4f8d6b50bdade (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 0ba2ce047b58f92aaef74380c8e10afbc33970cb
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Mon Dec 11 08:41:05 2017 +0100

    Bug 19788: Preserve case sensitivity when creating Local preferences
    
    Fix a bug tranforming new local preference variable name in lowercase.
    
    TO TEST:
    
    1. Admin > System preferences > Local use
    2. Button New preference. Fill variable field with 'TESTfoo'. Click
       Save.
    3. The new variable is named: 'testfoo'.
    4. Apply the patch.
    5. Button New preference. Fill variable field with 'TESTfoo2'. Click
       Save.
    6. The new variable is properly named: 'TESTfoo2'.
    
    Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 5ff8eca26c8d42cbca1c1e8b6b4ee10f2c45a387)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 1176b2e8f1fd1763e3074c8b01e1cfa31559b564
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Dec 19 11:56:07 2017 -0300

    Bug 19788: Add a test
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit ab7ea3ff3834e1429f1b3244ee45468c43e58684)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 1394d78f50a9d63af8e3b170bf2949f88fce3197
Author: David Bourgault <david.bourgault at inlibro.com>
Date:   Mon Nov 27 16:05:48 2017 -0500

    Bug 19702: Correct cookie path in Basket.js
    
    This corrects the cookie path in bootstrap/js/basket.js. It used to take
    the default value (current page path), but will now be "/"
    
    Test plan:
    0) Visit the OPAC, add a book to your basket
    1) Navigate to the OPAC's homepage (www.domain.com, without the
        /cgi-bin/koha)
        -> The basket will display as empty
        2) Apply patch
        3) Clear your cookies and your cache
        4) Redo step 1)
            -> Basket will display correctly
    
    Patch applies without issue and functions as descibed.
    Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 7934fea0c4c36f81b943de6c2016f8cedf53486c)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 5a6eae13bfcb7cf08b9b278fcc97a937afd571ec
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Nov 13 17:18:44 2017 +0000

    Bug 19621: Use Koha.Preference on template side to display/hide "Routing lists" tab
    
    Patch applies without issue and functions as described.
    
    Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 1792ab3d813839b61b060967f4d4f174462eaaa7)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit cdf608606fb35074acfe15d770fc36d395471bcb
Author: Janusz Kaczmarek <januszop at gmail.com>
Date:   Sat Nov 25 02:28:02 2017 +0100

    Bug 18458: Fix subfields ordering when Merging authority records
    
    While doing a merge, if a subfield(s) precedes the controlled subfields
    (like $i before $a in 7XX, which comes before $a -- rare but will
    become more and more usual) after merging will be moved to the end.
    This is not right.
    
    The patch (with AuthorityMergeMode == loose) make merge consider the
    subfields order: all subfields which originally were found before
    the first controlled subfield (e.g. $i before $a in 7XX / MARC 21)
    will remain in the front, the rest of not controlled subfields that
    should remain in the field will come after the subfields copied
    from authority rec.
    
    As a bonus, $9 will be placed at the end.
    
    To test:
    0) Have AuthorityMergeMode == loose;
    1) Have some field in bibliorecord, controlled by an authority, with
    extra subfield(s) (i.e. not present in authority rec.) placed at the
    beginning of the field;
    2) Open (not necessarily edit) and save the connected authority;
    3) See that the extra subfieds were moved to the end of the field
       (and $9 is in the front);
    4) Apply the patch;
    5) Reorder subfields in biblio field;
    6) Open (not necessarily edit) and save the connected authority;
    7) See that the order has been conserved, additionally $9 the last
       subfield in the field.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended:
    Moved field creation to its original place. Changed $9 handling. Simplified the following add_subfields for loop. Edited comments.
    Restored the append_fields_ordered call (see comment6).
    
    With this patch, the Merge.t test now passes.
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 806ad212f5c5c765abd657de7891bc41ed24dfcf)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 93b3cbff26680ca94534604b04bd99edfa6911b1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Dec 8 13:45:55 2017 +0100

    Bug 18458: Add a subtest in Merge.t
    
    This test illustrates the problem we have if you run it without the
    second patch. And it serves to demonstrate that we resolved the
    situation if you run it after the second patch.
    
    Test plan:
    [1] Without the second patch: The last subtest should fail.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 809dc7c9c5557307e5ae4f3443a7529b28b02311)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit e134b6768bb1da3e3af31b9b83c77f9ab78ffb83
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Dec 14 10:31:17 2017 -0500

    Bug 19813: Make MarcItemFieldsToOrder handle non-existing tags
    
    MarcItemFieldsToOrder defines how Koha looks at tags in order records to generate item data.
    
    Let's look at a simplified case:
    homebranch: 955$a
    holdingbranch: 956$a
    
    So, here we are looking at 955 for the home branch, and 956 for the holding branch. So, it should make sense that Koha requires that these fields exist in equal number in the record. That is, for each 955, there should be a corresponding 956.
    
    Let's look at a different case:
    homebranch: 946$a|975$a
    holdingbranch: 946$a|975$a
    
    In this case, we are using the fallback behavior. VendorA stores the branch data in 946, and VendorB stores it in 975. This seems like it would work, but it won't! That's because Koha is expecting there to be the same number of 946's as there are 975's! In reality, the VendorA records will have a number of 946's, and *zero* 975's. The inverse will be true for VendorB.
    
    Koha should be able to skip those tags that simply don't exist in the record.
    
    Test Plan:
    1) Set MarcItemFieldsToOrder to something like:
    homebranch: 946$a|975$a
    holdingbranch: 946$a|975$a
    budget_code: 946$f|975$f
    itype: 946$y|975$y
    notforloan: 946$l|975$l
    ccode: 946$t|975$c
    quantity: 946$q|975$q
    price: 946$p|975$p
    itemcallnumber: 946$n|975$n
    loc: 946$c|975$t
    2) Create a record using only the 975 tag for item building data
    3) Import the record into Koha
    4) Create a basket
    5) Attempt to add the record to the basket
    6) Note the unequal fields error
    7) Apply this patch
    8) Reload the page
    9) No error!
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Marci Chen <mchen at mckinneytexas.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended: Fix typo occurrance and theses.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 2e5f4af8390478953771656a4cec511503225386)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/AuthoritiesMarc.pm                              |   31 +++++++++++++++-----
 C4/Context.pm                                      |    3 +-
 acqui/addorderiso2709.pl                           |   25 +++++++++-------
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/js/basket.js         |    4 +--
 members/boraccount.pl                              |    1 -
 members/deletemem.pl                               |    1 -
 members/files.pl                                   |    1 -
 members/mancredit.pl                               |    1 -
 members/maninvoice.pl                              |    1 -
 members/member-flags.pl                            |    1 -
 members/member-password.pl                         |    1 -
 members/moremember.pl                              |    1 -
 members/notices.pl                                 |    1 -
 members/pay.pl                                     |    1 -
 members/paycollect.pl                              |    1 -
 members/purchase-suggestions.pl                    |    1 -
 members/readingrec.pl                              |    1 -
 members/routing-lists.pl                           |    1 -
 members/statistics.pl                              |    1 -
 t/db_dependent/Authority/Merge.t                   |   27 ++++++++++++++++-
 t/db_dependent/Context.t                           |    4 +--
 tools/viewlog.pl                                   |    1 -
 23 files changed, 70 insertions(+), 42 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list