@@ -, +, @@
- Perform an authority search which will return more than one
authority record.
- On the results page, click Actions -> Merge for two authority
records.
- Click "Next" after selecting a merge reference.
- On the next page you should see two tabs under "Source records."
Confirm that they work correctly.
- Confirm that tag and subfield selection still works correctly.
---
.../prog/en/includes/merge-record.inc | 40 ++++++++++---------
.../prog/en/modules/authorities/merge.tt | 6 +--
2 files changed, 24 insertions(+), 22 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc
@@ -1,5 +1,5 @@
[% BLOCK sourcetab %]
-
+
[% FOREACH field IN record.display %]
@@ -45,24 +45,26 @@
[% END %]
[% BLOCK mergesource %]
-
-
Source records
-
- [% IF ( sourcerecords.size ) %]
- [% FOREACH record IN sourcerecords %]
- [% PROCESS sourcetab tabrecord=record %]
- [% END %]
- [% END %]
-
+
+
Source records
+
+
+ [% IF ( sourcerecords.size ) %]
+ [% FOREACH record IN sourcerecords %]
+ [% PROCESS sourcetab tabrecord=record %]
+ [% END %]
+ [% END %]
+
+
[% END %]
[% BLOCK mergetarget %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
@@ -144,9 +144,9 @@ div#result { margin-top: 1em; }
ev.preventDefault();
newin=window.open($(this).attr('href'),'merge_reference', 'width=1000,height=600,toolbar=false,scrollbars=yes');
});
-
- // Creating tabs
- $("#tabs").tabs();
+ if( $(".tab-pane.active").length < 1 ){
+ $("#tabs a:first").tab("show");
+ }
});
--