[koha-commits] main Koha release repository branch master updated. v3.20.00-1168-ge724823

Mon Nov 9 19:41:49 CET 2015

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, master has been updated
       via  e72482340f8a0274a6489dc08c8f9e4ac80be5f3 (commit)
       via  20636ce19476fb7f31ebef0264537cb1bec3ef54 (commit)
       via  7d87ea53560b411dd44e141679e7d0071d55a7c2 (commit)
       via  f483414637efc6c44ea487b74b917a1ac7e88a84 (commit)
       via  44c4b9310d651d17c5e2163b6723fc56ba8e0c46 (commit)
       via  6143a2bf440ca44968c6609db8f3663ce3a3c9da (commit)
      from  02c69b218ad4a7a5e6aa7d390409de1d30a0ddbd (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 e72482340f8a0274a6489dc08c8f9e4ac80be5f3
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Nov 9 15:13:03 2015 -0300

    Bug 8064: DBRev 3.21.00.054

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 20636ce19476fb7f31ebef0264537cb1bec3ef54
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Mon Jun 9 09:55:28 2014 +0200

    Bug 8064: Fix unit tests for createMergeHash

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 7d87ea53560b411dd44e141679e7d0071d55a7c2
Author: Stefano Bargioni <bargioni at pusc.it>
Date:   Tue Mar 11 10:22:12 2014 +0100

    Bug 8064: Little fix for 003, 005, 008 in MARC21

    I found a little bug in the patch. Subfield '@' of tags 003, 005, 008 in
    MARC21 were not correctly handled by function check_mandatory() in
    merge.tt. I fixed the problem. In my opinion, the patch can be signed
    off.

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit f483414637efc6c44ea487b74b917a1ac7e88a84
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Dec 20 11:01:09 2013 +0100

    Bug 8064: Fix issues with control fields and non-repeatable check

    Fields < 010 were systematically unchecked during target rebuild because
    they have no subfields (unchecking manually all subfields of a field
    automatically uncheck the field)
    When user check a field or a subfield, we have to uncheck it before
    calling (sub)field_can_be_added. Otherwise, field is treated as if it
    was already in target record, and this is a problem for non-repeatable
    fields.

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 44c4b9310d651d17c5e2163b6723fc56ba8e0c46
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Nov 6 12:17:45 2013 +0100

    Bug 8064: Change the way target record is built.

    Instead of copying/removing a piece of DOM in target record each time a
    checkbox is checked/unchecked, the target record is *entirely* rebuilt
    each time a checkbox is checked/unchecked.
    This is slower but allow for a more consistent and less error-prone
    behaviour.

    This patch also fix the mandatory check for subfields

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 6143a2bf440ca44968c6609db8f3663ce3a3c9da
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Tue May 28 16:24:53 2013 +0200

    Bug 8064: Merge several biblios

    This patch improves the existing merging tool by adding possibility to
    merge more than 2 biblios.
    There is no functional changes:
      - Add some biblios to a list
      - In the list check some biblios and click on 'Merge selected records'
      - Choose the biblio which will be kept, all others will be deleted
      - On the next page you have all biblios you chose in tabs (left side
        of the screen) and the preview of result (right side)
      - Pick some fields or subfields from records that will be deleted or
        delete some fields from reference record.
      - Click on 'Merge', if there is no errors you are redirected to the
        biblio view.

    Added checks for non-repeatable subfields
    Added checks for mandatory fields and subfields before submitting the
    form.
    Added a final report which display deleted records (see syspref
    MergeReportFields)

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 Koha.pm                                            |    2 +-
 Koha/Util/MARC.pm                                  |   37 +--
 cataloguing/merge.pl                               |  280 +++++++++++---------
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   10 +
 .../prog/en/includes/merge-record-strings.inc      |    4 +-
 .../prog/en/includes/merge-record.inc              |  120 ++++-----
 koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js |  271 +++++++++++--------
 .../en/modules/admin/preferences/cataloguing.pref  |    9 +
 .../prog/en/modules/cataloguing/merge.tt           |  249 ++++++++++++-----
 .../prog/en/modules/virtualshelves/shelves.tt      |   20 +-
 t/Koha_MetadataRecord.t                            |   58 ++--
 t/Koha_Util_MARC.t                                 |   58 ++--
 13 files changed, 644 insertions(+), 475 deletions(-)

hooks/post-receive
-- 
main Koha release repository