Attachment #14909 for bug #7883

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

Lines 863-869 if ( $op eq "addbiblio" ) { Link Here

(-)a/cataloguing/addbiblio.pl (-2 / +5 lines)
863	else {	863	else {
864	( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );	864	( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
865	}	865	}
866	if ($redirect eq "items" \|\| ($mode ne "popup" && !$is_a_modif && $redirect ne "view")){	866	if ($redirect eq "items" \|\| ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){
867	if ($frameworkcode eq 'FA'){	867	if ($frameworkcode eq 'FA'){
868	my $borrowernumber = $input->param('circborrowernumber');	868	my $borrowernumber = $input->param('circborrowernumber');
869	my $barcode = $input->param('barcode');	869	my $barcode = $input->param('barcode');
Lines 882-888 if ( $op eq "addbiblio" ) { Link Here
882	exit;	882	exit;
883	}	883	}
884	}	884	}
885	elsif($is_a_modif \|\| $redirect eq "view"){	885	elsif(($is_a_modif \|\| $redirect eq "view") && $redirect ne "just_save"){
886	my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');	886	my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
887	my $views = { C4::Search::enabled_staff_search_views };	887	my $views = { C4::Search::enabled_staff_search_views };
888	if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {	888	if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
Lines 897-902 if ( $op eq "addbiblio" ) { Link Here
897	exit;	897	exit;
898		898
899	}	899	}
		900	elsif ($redirect eq "just_save"){
		901	print $input->redirect("/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=$biblionumber&framework=$frameworkcode");
		902	}
900	else {	903	else {
901	$template->param(	904	$template->param(
902	biblionumber => $biblionumber,	905	biblionumber => $biblionumber,




                    <div class="dialog alert">
                        <h4>Duplicate record suspected</h4>
                        <p>Is this a duplicate of <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% duplicatebiblionumber %]" onclick="openWindow('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% duplicatebiblionumber %]&amp;popup=1', 'Duplicate biblio','800','600'); return false;">[% duplicatetitle %]</a>?</p>
                        [% IF ( CAN_user_editcatalogue_edit_items ) %]<form action="/cgi-bin/koha/cataloguing/additemelliott.pl" method="get">
                                                    <input type="hidden" name="biblionumber" value="[% duplicatebiblionumber %]" />
                                                    <input type="submit" class="edit" value="Yes: Edit existing items" />
                                                </form>[% ELSE %]<form action="/cgi-bin/koha/catalogue/detailelliott.pl" method="get">
                                                    <input type="hidden" name="biblionumber" value="[% duplicatebiblionumber %]" />
                                                    <input type="submit" value="Yes: View existing items" />
                                                </form>[% END %]
                        <form action="/cgi-bin/koha/cataloguing/addbibliolasers.pl" method="get">
                        [% IF ( CAN_user_editcatalogue_edit_items ) %]<input type="button" class="save" onclick="confirmnotdup('items'); return false;" value="No: Save as new record" />[% ELSE %]<input type="button" class="save" onclick="confirmnotdup('view'); return false;" value="No: Save as new record" />[% END %]
                        </form>
                    </div>


    var savemenu = [
        { text: _("Save and view record"), value: 1, onclick: {fn:function(){redirect("view");}} },
        { text: _("Save and edit items"), value: 2, onclick: {fn:function(){redirect("items");}} },
        { text: _("Save and continue editing"), value: 3, onclick: {fn:function(){redirect("just_save");}} }
    ];
[% END %]

- 

Return to bug 7883

Lines 287-300 function Changefwk(FwkList) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-5 / +5 lines)
287	<div class="dialog alert">	287	<div class="dialog alert">
288	<h4>Duplicate record suspected</h4>	288	<h4>Duplicate record suspected</h4>
289	<p>Is this a duplicate of <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% duplicatebiblionumber %]" onclick="openWindow('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% duplicatebiblionumber %]&popup=1', 'Duplicate biblio','800','600'); return false;">[% duplicatetitle %]</a>?</p>	289	<p>Is this a duplicate of <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% duplicatebiblionumber %]" onclick="openWindow('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% duplicatebiblionumber %]&popup=1', 'Duplicate biblio','800','600'); return false;">[% duplicatetitle %]</a>?</p>
290	[% IF ( CAN_user_editcatalogue_edit_items ) %]<form action="/cgi-bin/koha/cataloguing/additem.pl" method="get">	290	[% IF ( CAN_user_editcatalogue_edit_items ) %]<form action="/cgi-bin/koha/cataloguing/additemelliott.pl" method="get">
291	<input type="hidden" name="biblionumber" value="[% duplicatebiblionumber %]" />	291	<input type="hidden" name="biblionumber" value="[% duplicatebiblionumber %]" />
292	<input type="submit" class="edit" value="Yes: Edit existing items" />	292	<input type="submit" class="edit" value="Yes: Edit existing items" />
293	</form>[% ELSE %]<form action="/cgi-bin/koha/catalogue/detail.pl" method="get">	293	</form>[% ELSE %]<form action="/cgi-bin/koha/catalogue/detailelliott.pl" method="get">
294	<input type="hidden" name="biblionumber" value="[% duplicatebiblionumber %]" />	294	<input type="hidden" name="biblionumber" value="[% duplicatebiblionumber %]" />
295	<input type="submit" value="Yes: View existing items" />	295	<input type="submit" value="Yes: View existing items" />
296	</form>[% END %]	296	</form>[% END %]
297	<form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get">	297	<form action="/cgi-bin/koha/cataloguing/addbibliolasers.pl" method="get">
298	[% IF ( CAN_user_editcatalogue_edit_items ) %]<input type="button" class="save" onclick="confirmnotdup('items'); return false;" value="No: Save as new record" />[% ELSE %]<input type="button" class="save" onclick="confirmnotdup('view'); return false;" value="No: Save as new record" />[% END %]	298	[% IF ( CAN_user_editcatalogue_edit_items ) %]<input type="button" class="save" onclick="confirmnotdup('items'); return false;" value="No: Save as new record" />[% ELSE %]<input type="button" class="save" onclick="confirmnotdup('view'); return false;" value="No: Save as new record" />[% END %]
299	</form>	299	</form>
300	</div>	300	</div>
Lines 346-352 function Changefwk(FwkList) { Link Here
346		346
347	var savemenu = [	347	var savemenu = [
348	{ text: _("Save and view record"), value: 1, onclick: {fn:function(){redirect("view");}} },	348	{ text: _("Save and view record"), value: 1, onclick: {fn:function(){redirect("view");}} },
349	{ text: _("Save and edit items"), value: 2, onclick: {fn:function(){redirect("items");}} }	349	{ text: _("Save and edit items"), value: 2, onclick: {fn:function(){redirect("items");}} },
		350	{ text: _("Save and continue editing"), value: 3, onclick: {fn:function(){redirect("just_save");}} }
350	];	351	];
351	[% END %]	352	[% END %]
352		353
353	-