[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1107-g0ee3a41

[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, master has been updated
       via  0ee3a414e8514dd0bade25dd894a79d6b4f88713 (commit)
      from  94868f61c4c395f8393d34862a99609247f6dd73 (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 0ee3a414e8514dd0bade25dd894a79d6b4f88713
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Fri Jul 26 15:54:45 2013 +0200

    Bug 10650 - export merge-record.inc javascript into a file
    
    Bug 9755 added a refactoring of records merge adding the include
    merge-record.inc. This include contains a block "mergejs" containing all
    JavaScript code that was in merge.tt.
    This patch exports this code into a js file.
    Translatable strings contained in this file are in
    merge-record-strings.inc.
    
    Test plan :
    - Put two 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 a repeatable field
    => The field is added to destination record
    - Click on a subfield of a field existing in destination record
    => The subfield is added to destination record
    - Click on a non repeatable field existing in destination record
    => You get an alert and field is not added
    - Click on a subfield of a field not existing in destination record
    => You get an alert and subfield is not added
    - Click on Merge
    => Records are merged
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes tests and test plan, no regressions found.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 .../prog/en/includes/merge-record-strings.inc      |    6 +
 .../prog/en/includes/merge-record.inc              |  136 -------------------
 koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js |  139 ++++++++++++++++++++
 .../prog/en/modules/cataloguing/merge.tt           |    7 +-
 4 files changed, 151 insertions(+), 137 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/merge-record-strings.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js


hooks/post-receive
-- 
main Koha release repository