Attachment #7321 for bug #6210

View | Details | Raw Unified | Return to bug 6210
Collapse All | Expand All

Lines 127-138 if ($merge) { Link Here

(-)a/cataloguing/merge.pl (-1 / +10 lines)
127	}	127	}
128	else {	128	else {
129	my $data1 = GetBiblioData($biblionumber[0]);	129	my $data1 = GetBiblioData($biblionumber[0]);
		130	my $record1 = GetMarcBiblio($biblionumber[0]);
		131
130	my $data2 = GetBiblioData($biblionumber[1]);	132	my $data2 = GetBiblioData($biblionumber[1]);
		133	my $record2 = GetMarcBiblio($biblionumber[1]);
131		134
132	# Checks if both records use the same framework	135	# Checks if both records use the same framework
133	my $frameworkcode1 = &GetFrameworkCode($biblionumber[0]);	136	my $frameworkcode1 = &GetFrameworkCode($biblionumber[0]);
134	my $frameworkcode2 = &GetFrameworkCode($biblionumber[1]);	137	my $frameworkcode2 = &GetFrameworkCode($biblionumber[1]);
135		138
		139
		140	my $subtitle1 = GetRecordValue('subtitle', $record1, $frameworkcode1);
		141	my $subtitle2 = GetRecordValue('subtitle', $record2, $frameworkcode1);
		142
136	if ($mergereference) {	143	if ($mergereference) {
137		144
138	my $framework;	145	my $framework;
Lines 170-176 if ($merge) { Link Here
170	biblio1 => $biblionumber[0],	177	biblio1 => $biblionumber[0],
171	biblio2 => $biblionumber[1],	178	biblio2 => $biblionumber[1],
172	title1 => $data1->{'title'},	179	title1 => $data1->{'title'},
173	title2 => $data2->{'title'}	180	subtitle1 => $subtitle1,
		181	title2 => $data2->{'title'},
		182	subtitle2 => $subtitle2
174	);	183	);
175	if ($frameworkcode1 ne $frameworkcode2) {	184	if ($frameworkcode1 ne $frameworkcode2) {
176	my $frameworks = getframeworks;	185	my $frameworks = getframeworks;




[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Cataloging &rsaquo; Merging records</title>
[% INCLUDE 'greybox.inc' %]
[% INCLUDE 'doc-head-close.inc' %]
<style type="text/css">
div.record ul, div.record li { float:none; display:block; }

<body>
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cataloging-search.inc' %]
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>  &rsaquo; Merging records</div>

<div id="doc" class="yui-t7">


<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post">
    <fieldset class="rows">
	<legend>Merge reference</legend>
    <table>
      <tr>
        <td style="border-width: 0px; text-align: left">
	<ol>
	<li class="radio"><input type="radio" value="[% biblio1 %]" 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=[% biblio1 %]" title="MARC" rel="gb_page_center[600,500]">[% biblio1 %]</a>)</label></li>
	<li class="radio"><input type="radio" value="[% biblio2 %]" 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=[% biblio2 %]" title="MARC" rel="gb_page_center[600,500]">[% biblio2 %]</a>)</label></li>

        </td>
        <td style="border-width: 0px">
    [% IF frameworkselect %]
          <li><label for="frameworkcode">Using framework:</label>
                      <select name="frameworkcode" id="frameworkcode">
                                      <option value="Default">Default</option>
                                      [% FOREACH frameworkcodeloo IN frameworkselect %]
                                          [% IF ( frameworkcodeloo.selected ) %]
                                              <option value="[% frameworkcodeloo.value %]" selected="selected">
                                          [% ELSE %]
                                              <option value="[% frameworkcodeloo.value %]">
                                          [% END %]
                                           [% frameworkcodeloo.frameworktext %]
                                           </option>
                                      [% END %]
                      </select></li>
    [% END %]
</ol>
      </tr>
    </table>

	<input type="hidden" name="biblionumber" value="[% biblio1 %]" />
	<input type="hidden" name="biblionumber" value="[% biblio2 %]" />
- 

Return to bug 6210

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-26 / +19 lines)
1	[% INCLUDE 'doc-head-open.inc' %]	1	[% INCLUDE 'doc-head-open.inc' %]
2	<title>Koha &rsaquo; Cataloging &rsaquo; Merging records</title>	2	<title>Koha &rsaquo; Cataloging &rsaquo; Merging records</title>
		3	[% INCLUDE 'greybox.inc' %]
3	[% INCLUDE 'doc-head-close.inc' %]	4	[% INCLUDE 'doc-head-close.inc' %]
4	<style type="text/css">	5	<style type="text/css">
5	div.record ul, div.record li { float:none; display:block; }	6	div.record ul, div.record li { float:none; display:block; }
Lines 171-177 function changeFramework(fw) { Link Here
171	<body>	172	<body>
172	[% INCLUDE 'header.inc' %]	173	[% INCLUDE 'header.inc' %]
173	[% INCLUDE 'cataloging-search.inc' %]	174	[% INCLUDE 'cataloging-search.inc' %]
174	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> &rsaquo; [% IF ( biblionumber ) %]Editing <em>[% title \|html %]</em> (Record Number [% biblionumber %])[% ELSE %]Add MARC Record[% END %]</div>	175	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> &rsaquo; Merging records</div>
175		176
176	<div id="doc" class="yui-t7">	177	<div id="doc" class="yui-t7">
177		178
Lines 198-230 function changeFramework(fw) { Link Here
198	<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post">	199	<form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post">
199	<fieldset class="rows">	200	<fieldset class="rows">
200	<legend>Merge reference</legend>	201	<legend>Merge reference</legend>
201	<table>
202	<tr>
203	<td style="border-width: 0px; text-align: left">
204	<ol>	202	<ol>
205	<li class="radio"><input type="radio" value="[% biblio1 %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 %]')" /><label style="float:none" for="mergereference1">[% title1 %] ([% biblio1 %])</label></li>	203	<li class="radio"><input type="radio" value="[% biblio1 %]" 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=[% biblio1 %]" title="MARC" rel="gb_page_center[600,500]">[% biblio1 %]</a>)</label></li>
206	<li class="radio"><input type="radio" value="[% biblio2 %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 %]')" /><label style="float:none" for="mergereference2">[% title2 %] ([% biblio2 %])</label></li>	204	<li class="radio"><input type="radio" value="[% biblio2 %]" 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=[% biblio2 %]" title="MARC" rel="gb_page_center[600,500]">[% biblio2 %]</a>)</label></li>
207	</ol>	205
208	</td>
209	<td style="border-width: 0px">
210	[% IF frameworkselect %]	206	[% IF frameworkselect %]
211	<label style="float:none" for="frameworkcode">Framework:</label><br>	207	<li><label for="frameworkcode">Using framework:</label>
212	<select name="frameworkcode" id="Frameworks">	208	<select name="frameworkcode" id="frameworkcode">
213	<option value="Default">Default</option>	209	<option value="Default">Default</option>
214	[% FOREACH frameworkcodeloo IN frameworkselect %]	210	[% FOREACH frameworkcodeloo IN frameworkselect %]
215	[% IF ( frameworkcodeloo.selected ) %]	211	[% IF ( frameworkcodeloo.selected ) %]
216	<option value="[% frameworkcodeloo.value %]" selected="selected">	212	<option value="[% frameworkcodeloo.value %]" selected="selected">
217	[% ELSE %]	213	[% ELSE %]
218	<option value="[% frameworkcodeloo.value %]">	214	<option value="[% frameworkcodeloo.value %]">
219	[% END %]	215	[% END %]
220	[% frameworkcodeloo.frameworktext %]	216	[% frameworkcodeloo.frameworktext %]
221	</option>	217	</option>
222	[% END %]	218	[% END %]
223	</select>	219	</select></li>
224	[% END %]	220	[% END %]
225	</td>	221	</ol>
226	</tr>
227	</table>
228		222
229	<input type="hidden" name="biblionumber" value="[% biblio1 %]" />	223	<input type="hidden" name="biblionumber" value="[% biblio1 %]" />
230	<input type="hidden" name="biblionumber" value="[% biblio2 %]" />	224	<input type="hidden" name="biblionumber" value="[% biblio2 %]" />
231	-