@@ -, +, @@ merge process - Select two patrons in the list of search results and click "Merge selected patrons." - On the merge patron records page, confirm that the two patron names are links which, when clicked, open the patron details in another tab. - Click a radio button to select the patron whose record will be the basis of the merge. The "Compare patrons" button and "Merge patrons" should go from disabled to enabled. - Click the "Compare patrons" button. A modal window should display highlighting the differences in some selected values in the patron record. The patron you selected as the basis for the merge should appear on the left. - Close the modal and select the other patron as the basis of the merge. "Compare patrons" again. The other patron should now appear in the left pane of the comparison. - Test that the "Merge patrons" button in the modal window works correctly to submit the merge form and that the correct patron is used as the basis for merging. - Repeat the same process above but select more than two patrons for merging. The "Compare patrons" button should not appear. --- .../prog/en/modules/members/merge-patrons.tt | 179 ++++++++++++++++++++- 1 file changed, 171 insertions(+), 8 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt @@ -7,7 +7,43 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons › Merge patron records [% INCLUDE 'doc-head-close.inc' %] - +[% FILTER collapse %] + +[% END %] [% INCLUDE 'header.inc' %] @@ -52,8 +88,19 @@ [% IF action == 'show' %] [% IF patrons.count > 1 %] + [% IF ( patrons.count == 2 ) %] +
+
+ +
+
+ [% END %] +

Select patron to keep. Data from the other patrons will be transferred to this patron record and the remaining patron records will be deleted.

-
+ + @@ -70,13 +117,18 @@ [% FOREACH p IN patrons %] - + - + @@ -139,21 +191,132 @@ + + + [% MACRO jsinclude BLOCK %] [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] - + [% Asset.js("lib/jsdiff/jsdiff.min.js") | $raw %] [% END %] --
[% INCLUDE 'patron-title.inc' patron = p %] + + [% INCLUDE 'patron-title.inc' patron = p %] + + + [% p.dateofbirth | $KohaDates %] [% Categories.GetName( p.categorycode ) | html %] ([% p.categorycode | html %]) [% Branches.GetName( p.branchcode ) | html %]