Bugzilla – Attachment 20448 Details for
Bug 5202
Merge authority records
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 5202 QA follow-up: improve merge reference selection
PASSED-QA-Bug-5202-QA-follow-up-improve-merge-refe.patch (text/plain), 4.04 KB, created by
Katrin Fischer
on 2013-08-18 18:51:34 UTC
(
hide
)
Description:
[PASSED QA] Bug 5202 QA follow-up: improve merge reference selection
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-08-18 18:51:34 UTC
Size:
4.04 KB
patch
obsolete
>From d2c5d9d7741acf216ac871e676cf2d9cd392aa20 Mon Sep 17 00:00:00 2001 >From: Jared Camins-Esakov <jcamins@cpbibliography.com> >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 <Katrin.Fischer.83@web.de> >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) { > <fieldset class="rows"> > <legend>Merge reference</legend> > <ol> >- <li class="radio"><input type="radio" value="[% recordid1 %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 %]')" /><label for="mergereference1">[% title1 %] [% FOREACH subtitl1 IN subtitle1 %] [% subtitl1.subfield %][% END %] (<a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% recordid1 %]" title="MARC" rel="gb_page_center[600,500]">[% recordid1 %]</a>)</label></li> >- <li class="radio"><input type="radio" value="[% recordid2 %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 %]')" /><label for="mergereference2">[% title2 %] [% FOREACH subtitl2 IN subtitle2 %] [% subtitl2.subfield %][% END %] (<a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% recordid2 %]" title="MARC" rel="gb_page_center[600,500]">[% recordid2 %]</a>)</label></li> >+ <li class="radio"><input type="radio" value="[% recordid1 %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 %]')" /><label for="mergereference1">[% title1 %] [% FOREACH subtitl1 IN subtitle1 %] [% subtitl1.subfield %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid1 %][% IF frameworklabel1 %] — [% frameworklabel1 %][% END %]</a>)</label></li> >+ <li class="radio"><input type="radio" value="[% recordid2 %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 %]')" /><label for="mergereference2">[% title2 %] [% FOREACH subtitl2 IN subtitle2 %] [% subtitl2.subfield %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid2 %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid2 %][% IF frameworklabel2 %] — [% frameworklabel2 %][% END %]</a>)</label></li> > > [% IF frameworkselect %] > <li><label for="frameworkcode">Using framework:</label> >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5202
:
18443
|
18514
|
18516
|
18532
|
19436
|
19634
|
19891
|
19892
|
20099
|
20100
|
20101
|
20440
|
20441
|
20442
|
20443
|
20444
|
20445
|
20446
|
20447
| 20448 |
20449