[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.03-6-ge3c59a0

[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.22.x has been updated
       via  e3c59a0587b00015362ecf4b89372a289666afa4 (commit)
       via  8931489565e6c272bce18dd3971e932cb78b0074 (commit)
       via  d7ea9255568f37823d97f81e9cbf1c7aff9edffd (commit)
      from  af61bfbcf827fc51e2f27f45afce9bec349a0bb4 (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 e3c59a0587b00015362ecf4b89372a289666afa4
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Jan 6 19:11:27 2016 +0100

    Bug 15358: Fix authorities merge
    
    Bug 8064 (Merge several biblio records) change some code used in both
    biblios and authorities merge tool without updating the authorities
    merge tool.
    This patch fixes that.
    
    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: Julian Maurice <julian.maurice at biblibre.com>

commit 8931489565e6c272bce18dd3971e932cb78b0074
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jan 14 12:27:55 2016 +0000

    Bug 15578: Make sure all params will be taken into account when instantiating
    
    The tests in t/db_dependent/Koha_Authority.t expects at least 1
    authority record in the DB to run them, otherwise they are skipped.
    On our integration server, the DB does not contain any records, and the
    tests are skipped.
    Unfortunately these tests were testing the authid method of
    Koha::MetadataRecord::Authority.
    
    Test plan:
    Apply the first patch, launch tests
    => Fail
    Apply the second patch, launch tests
    => \o/
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit d7ea9255568f37823d97f81e9cbf1c7aff9edffd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jan 14 12:27:32 2016 +0000

    Bug 15578: Insert authority records before processing tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 Koha/MetadataRecord.pm                             |   13 +----
 authorities/merge.pl                               |   20 +++++--
 cataloguing/merge.pl                               |    2 +-
 .../prog/en/includes/merge-record.inc              |   20 +++----
 .../prog/en/modules/authorities/merge.tt           |    8 +--
 t/db_dependent/Koha_Authority.t                    |   57 ++++++++++++--------
 6 files changed, 69 insertions(+), 51 deletions(-)


hooks/post-receive
-- 
main Koha release repository