From d2c5d9d7741acf216ac871e676cf2d9cd392aa20 Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Sun, 18 Aug 2013 12:57:50 -0400 Subject: [PATCH] [PASSED QA] Bug 5202 QA follow-up: improve merge reference selection The link on the merge reference had been wrong, and framework types were not indicated when you were merging records of two types. This patch fixes those problems. Signed-off-by: Katrin Fischer Passes all tests and QA script. --- authorities/merge.pl | 2 ++ .../prog/en/modules/authorities/merge.tt | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/authorities/merge.pl b/authorities/merge.pl index be24c8e..5682b5e 100755 --- a/authorities/merge.pl +++ b/authorities/merge.pl @@ -169,6 +169,8 @@ else { frameworkselect => \@frameworkselect, frameworkcode1 => $recordObj1->authtype, frameworkcode2 => $recordObj2->authtype, + frameworklabel1 => $frameworks->{$recordObj1->authtype}->{'authtypetext'}, + frameworklabel2 => $frameworks->{$recordObj2->authtype}->{'authtypetext'}, ); } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt index e8a41f5..171de3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt @@ -23,6 +23,11 @@ $(document).ready(function(){ $.getJSON("/cgi-bin/koha/authorities/merge_ajax.pl", {frameworkcode : "[% framework %]" }, function(json) { tagslib = json; }); + + $('.preview-merge-reference').click(function (ev) { + ev.preventDefault(); + newin=window.open($(this).attr('href'),'merge_reference', 'width=1000,height=600,toolbar=false,scrollbars=yes'); + }); [% PROCESS mergejs %] }); @@ -76,8 +81,8 @@ function changeFramework(fw) {
Merge reference
    -
  1. -
  2. +
  3. +
  4. [% IF frameworkselect %]
  5. -- 1.7.9.5