[koha-commits] main Koha release repository branch 3.16.x updated. v3.16.02-14-g4d3f45c

[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.16.x has been updated
       via  4d3f45cafdcadfb880be8ff27dabc6b299de2652 (commit)
      from  4e7fadacc21d29f286b759662163868b9644c1c7 (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 4d3f45cafdcadfb880be8ff27dabc6b299de2652
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Fri Jul 26 17:02:01 2013 +0200

    Bug 10648 - In records merge greatest field can not be added
    
    When merging 2 records (/cgi-bin/koha/cataloguing/merge.pl), the destination record is build using the fields and subfields checked in source records.
    When a field is checked, the javascript code searches in destination record a field with a greater tag number to insert new field before.
    When the new field tag number is greater than all existing field tag numbers, the field is not added.
    
    This patch corrects this by adding at end if no greater field tag number exists. Also adds a sort of fields by tag number because all mergo code is based on this.
    
    Test plan :
    - Add to a framework a repeatable field with the greater non existing tag number. For example 998.
    - Edit 2 records with this framework and add them a value in this tag.
    - Put those records is a list
    - Go to this list and check the two records
    - Click on "Merge selected"
    - Click on next
    - Go to second source record
    - Click on the greatest tag number. for example 998.
    => The field is added at the end of destination record
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Works as described, no regressions.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository