Bug 15358: Fix authorities merge

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / includes / merge-record.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc
index 81a7cc8..2d77a2f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc
@@ -1,91 +1,75 @@
 [% BLOCK sourcetab %]
-    <div id="tabrecord[% recordnumber %]">
-    [% IF ( records ) %]
-
+    <div id="tabrecord[% record.recordid %]">
         <div class="record">
-        <ul id="ulrecord[% recordnumber %]">
-        [% FOREACH record IN records %]
-            [% FOREACH fiel IN record.field %]
-            <li id="k[% fiel.key %]">
-                [% IF (defaultrecord) %]
-                    <input type="checkbox" checked="checked" class="fieldpick" id="rec_[% recordnumber %]_[% fiel.key %]" />
-                [% ELSE %]
-                    <input type="checkbox" class="fieldpick" id="rec_[% recordnumber %]_[% fiel.key %]" />
-                [% END %]
-                <span class="field">[% fiel.tag %]</span>
+            <ul id="ulrecord[% record.recordid %]">
+                [% FOREACH field IN record.display %]
+                  [% IF field.tag != biblionumbertag %]
+                    <li id="k[% field.key %]">
+                        [% IF (tabrecord.reference) %]
+                            <input type="checkbox" checked="checked" class="fieldpick" id="rec_[% record.recordid %]_[% field.key %]" />
+                        [% ELSE %]
+                            <input type="checkbox" class="fieldpick" id="rec_[% record.recordid %]_[% field.key %]" />
+                        [% END %]
+                        <label for="rec_[% record.recordid %]_[% field.key %]"><span class="field">[% field.tag %]</span></label>
 
-                <input type="hidden" name="tag_[% fiel.tag %]_indicator1_[% fiel.key %]" value="[% fiel.indicator1 %]" />
-                <input type="hidden" name="tag_[% fiel.tag %]_indicator2_[% fiel.key %]" value="[% fiel.indicator2 %]" />
-                [% IF ( fiel.value ) %] / [% fiel.value %]
-                <input type="hidden" name="tag_[% fiel.tag %]_code_00_[% fiel.key %]" value="00" />
-                <input type="hidden" name="tag_[% fiel.tag %]_subfield_00_[% fiel.key %]" value="[% fiel.value %]" />
-                [% END %]
+                        <input type="hidden" name="tag_[% field.tag %]_indicator1_[% field.key %]" value="[% field.indicator1 %]" />
+                        <input type="hidden" name="tag_[% field.tag %]_indicator2_[% field.key %]" value="[% field.indicator2 %]" />
+                        [% IF ( field.value ) %]
+                            / [% field.value %]
+                            <input type="hidden" name="tag_[% field.tag %]_code_00_[% field.key %]" value="00" />
+                            <input type="hidden" name="tag_[% field.tag %]_subfield_00_[% field.key %]" value="[% field.value %]" />
+                        [% END %]
 
-                [% IF ( fiel.subfield ) %]
-                <ul>
-                    [% FOREACH subfiel IN fiel.subfield %]
-                    <li id="k[% subfiel.subkey %]">
-                        [% IF (defaultrecord) %]
-                            <input type="checkbox" checked="checked" class="subfieldpick" id="rec_[% recordnumber %]_[% subfiel.subkey %]" />
-                        [% ELSE %]
-                            <input type="checkbox" class="subfieldpick" id="rec_[% recordnumber %]_[% subfiel.subkey %]" />
+                        [% IF ( field.subfield.size ) %]
+                            <ul>
+                                [% FOREACH subfield IN field.subfield %]
+                                    <li id="k[% subfield.subkey %]">
+                                        [% IF (tabrecord.reference) %]
+                                            <input type="checkbox" checked="checked" class="subfieldpick" id="rec_[% record.recordid %]_[% subfield.subkey %]" />
+                                        [% ELSE %]
+                                            <input type="checkbox" class="subfieldpick" id="rec_[% record.recordid %]_[% subfield.subkey %]" />
+                                        [% END %]
+                                        <label for="rec_[% record.recordid %]_[% subfield.subkey %]"><span class="subfield">[% subfield.subtag %]</span> / [% subfield.value %]</label>
+                                        <input type="hidden" name="tag_[% field.tag %]_code_[% subfield.subtag %]_[% field.key %]_[% subfield.subkey %]" value="[% subfield.subtag %]" />
+                                        <input type="hidden" name="tag_[% field.tag %]_subfield_[% subfield.subtag %]_[% subfield.key %]_[% subfield.subkey %]" value="[% subfield.value %]" />
+                                    </li>
+                                [% END %]
+                            </ul>
                         [% END %]
-                        <span class="subfield">[% subfiel.subtag %]</span> / [% subfiel.value %]
-                    <input type="hidden" name="tag_[% subfiel.tag %]_code_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.subtag %]" />
-                    <input type="hidden" name="tag_[% subfiel.tag %]_subfield_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.value |html%]" />
                     </li>
-                    [% END %]
-                </ul>
+                  [% END %]
                 [% END %]
-            [% END %]
-            </li>
-        [% END %]
-        </ul>
+            </ul>
         </div><!-- /div.record -->
-    [% END %]
-    </div><!-- /div#tabrecord[% recordnumber %] -->
+    </div><!-- /div#tabrecordXXX -->
 [% END %]
+
 [% BLOCK mergesource %]
 <div id="tabs" class="toptabs">
 <h2>Source records</h2>
     <ul>
-    <li><a href="#tabrecord1">[% recordid1 %]</a></li>
-    <li><a href="#tabrecord2">[% recordid2 %]</a></li>
+        [% FOREACH record IN sourcerecords %]
+            <li>
+                <a href="#tabrecord[% record.recordid %]">
+                    [% record.recordid %]
+                    [% IF record.reference %](ref)[% END %]
+                </a>
+            </li>
+        [% END %]
     </ul>
-    [% PROCESS sourcetab records=record1 recordnumber=1 defaultrecord=1 %]
-    [% PROCESS sourcetab records=record2 recordnumber=2 defaultrecord=0 %]
+    [% IF ( sourcerecords.size ) %]
+        [% FOREACH record IN sourcerecords %]
+            [% PROCESS sourcetab tabrecord=record %]
+        [% END %]
+    [% END %]
 </div> <!-- // #tabs -->
 [% END %]
+
 [% BLOCK mergetarget %]
 <div id="result">
     <h2>Destination record</h2>
     <div style="border:1px solid #E8E8E8;padding:1em;margin-top:2em;">
-        <ul id="resultul">
-        [% FOREACH record IN record1 %]
-            [% FOREACH fiel IN record.field %]<li id="k[% fiel.key %]">
-                <span class="field">[% fiel.tag %]</span>
-                <input type="hidden" name="tag_[% fiel.tag %]_indicator1_[% fiel.key %]" value="[% fiel.indicator1 %]" />
-                <input type="hidden" name="tag_[% fiel.tag %]_indicator2_[% fiel.key %]" value="[% fiel.indicator2 %]" />
-                [% IF ( fiel.value ) %] /
-                    [% fiel.value %]
-                    <input type="hidden" name="tag_[% fiel.tag %]_code_00_[% fiel.key %]" value="00" />
-                    <input type="hidden" name="tag_[% fiel.tag %]_subfield_00_[% fiel.key %]" value="[% fiel.value |html%]" />
-                [% END %]
-
-                [% IF ( fiel.subfield ) %]
-                    <ul>
-                        [% FOREACH subfiel IN fiel.subfield %]
-                            <li id="k[% subfiel.subkey %]">
-                                <span class="subfield">[% subfiel.subtag %]</span> / [% subfiel.value %]
-                                <input type="hidden" name="tag_[% subfiel.tag %]_code_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.subtag %]" />
-                                <input type="hidden" name="tag_[% subfiel.tag %]_subfield_[% subfiel.subtag %]_[% subfiel.key %]_[% subfiel.subkey %]" value="[% subfiel.value |html%]" />
-                            </li>
-                        [% END %]
-                    </ul>
-                [% END %]
-            </li>[% END %]
-        [% END %]
-        </ul>
+        <ul id="resultul"></ul>
     </div>
 </div> <!-- // #result -->
 [% END %]