[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.16-36-gbd8c864

Mon Feb 20 11:57:27 CET 2017

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.22.x has been updated
       via  bd8c8640921be180a39365af577989b06a1e4cf9 (commit)
       via  d664e362794dcc4911e0b7305ad405248810f649 (commit)
       via  a3a886e7be212a7ddaf0c4df884e4274fe630713 (commit)
       via  517703acea18f9379f953d99cee1e821e500fe60 (commit)
       via  8b4f7a7499756b548cfb7e0cfc5bc816602b4296 (commit)
       via  bd5995ee64b627c8decd3f668b3849013e5f9aa2 (commit)
       via  4127172f676d147f933ea3573d37d66ed827d5d9 (commit)
       via  40e69f86cb06a7247707d4f0b0375bd344a24e35 (commit)
      from  7968d5d59be0bc3f5bb8ad903c45bd2fc3aefac8 (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 bd8c8640921be180a39365af577989b06a1e4cf9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jan 23 14:06:48 2017 +0100

    Bug 17913: [3.22.x] Authority merge fix

    [PUSHED_17.05]

    Squashed into one patch for 3.22.x.

commit d664e362794dcc4911e0b7305ad405248810f649
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Jan 20 12:16:44 2017 +0100

    Bug 17909: QA followup: remove unused var and move global var

    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    (cherry picked from commit 1d28489f76a6890b38009e5f5b92ccd1d18051bc)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit a3a886e7be212a7ddaf0c4df884e4274fe630713
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jan 20 11:29:30 2017 +0100

    Bug 17909: [Follow-up] Quick fix for UNIMARC

    UNIMARC inserts field 100. This interferes the field count and order
    in the test.
    Note: This is a quick fix. Will polish it after bug 17913.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    (cherry picked from commit db708b9f37378656621e4d73e8a36c146730db5e)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 517703acea18f9379f953d99cee1e821e500fe60
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Mon Jan 16 13:03:21 2017 +0000

    Bug 17909: Followup - fix typos

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

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

    EDIT:

    Adjusted three small typos that did not disturb the test in its current
    form, but do when we are fixing bugs on bug 17913.

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    (cherry picked from commit f61451ff0ff5ca4bde8f5e1425caf37b501fb8ba)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 8b4f7a7499756b548cfb7e0cfc5bc816602b4296
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jan 16 12:15:56 2017 +0100

    Bug 17909: Additional polishing

    No spectacular things:

    [1] Move the framework modifications to a sub. Use same style to create auth types and linked fields.
    [2] Change some new Object occurrences to Object->new.
    [3] Add tests for field count and field order in the first two subsets.
    [4] Few whitespace changes (sorry) and comment lines.

    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: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    (cherry picked from commit cac98af1f40c753d094b4f1b69a638455c31d26f)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit bd5995ee64b627c8decd3f668b3849013e5f9aa2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Jan 4 11:15:51 2017 +0100

    Bug 17909: Add tests for merging with another authtype

    Originally aimed for bug 9988. Adjusted in line with other subtests.
    Will polish the three subtests a little more on a follow-up.

    Test plan:
    Run t/db_dependent/Authorities/Merge.t

    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: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    (cherry picked from commit 1d8d9161fa0f917e7e974d0fe76ca400e7119658)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 4127172f676d147f933ea3573d37d66ed827d5d9
Author: mbeaulieu <mbeaulieu at inlibro.com>
Date:   Mon Aug 18 10:04:55 2014 -0400

    Bug 17909: Adding tests from bug 11315

    Based on original patch from Maxime Beaulieu on bug 11315.
    Amended by Marcel de Rooy on report 17909.

    EDIT:

    Original tests have been adjusted in view of:
    [1] Test on bug 11315 heavily leaned on DBD::Mock. Since we are
        using Test::DBIx::Class on such tests now, this would need attention.
        Moreover, the advantage of mocking the database in this case is at
        least arguable.
    [2] Matching the first (somewhat older) subtest of 11700.
    [3] Simplification and readability.
        Look e.g. at the use of $MARCto and $MARCfrom on 11315.

    This made me merge them in the db_dependent counterpart.

    Also note that this subtest adds another needed test case: the merge from
    auth1 to modified auth1, while 11700 tested auth1 to auth2.

    Test plan:
    Just run t/db_dependent/Authorities/Merge.t

    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: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    (cherry picked from commit 7859ea37b2bc2c9ae36b2e2f2907cade573ccaae)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 40e69f86cb06a7247707d4f0b0375bd344a24e35
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Feb 19 11:31:13 2014 +0100

    Bug 17909: Add unit tests for C4::AuthoritiesMarc::merge

    Original patch from Julian Maurice on bug 11700.
    With sign offs by:
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

    Amended by Marcel de Rooy on report 17909.

    EDIT (January 2017):
    Removed some tests not related to merge.
    Put remaining tests in a subtest, made them working on current merge.
    Slightly revised the mocking.

    Note: I plan to move the zebra retrieval stuff outside merge in one of
    the next stages, and replace it by calling Koha::SearchEngine. This will
    reduce mocking complexity here.

    Test plan:
    Just run t/db_dependent/Authorities/Merge.t

    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: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    (cherry picked from commit 1fb7d9a869987b0e8de6cd7316ee78741a69c65f)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 C4/AuthoritiesMarc.pm                              |  101 ++++--
 .../en/modules/admin/preferences/authorities.pref  |    9 +
 t/db_dependent/Authorities/Merge.t                 |  321 ++++++++++++++++++++
 3 files changed, 405 insertions(+), 26 deletions(-)
 create mode 100755 t/db_dependent/Authorities/Merge.t

hooks/post-receive
-- 
main Koha release repository