http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10650 Fridolyn SOMERS <fridolyn.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff Assignee|gmcharlt@gmail.com |fridolyn.somers@biblibre.co | |m --- Comment #1 from Fridolyn SOMERS <fridolyn.somers@biblibre.com> --- Created attachment 19962 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=19962&action=edit Bug 10650 - export merge-record.inc javascript into a file See commit message -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10650 Fridolyn SOMERS <fridolyn.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |10648 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10650 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #19962|0 |1 is obsolete| | --- Comment #2 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 20914 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20914&action=edit [SIGNED-OFF] 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@myacpl.org> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10650 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #20914|0 |1 is obsolete| | --- Comment #3 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 20975 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=20975&action=edit [PASSED QA] 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@myacpl.org> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Passes tests and test plan, no regressions found. -- You are receiving this mail because: You are watching all bug changes.