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

(-)a/cataloguing/addbiblio.pl (-2 / +5 lines)
Lines 871-877 if ( $op eq "addbiblio" ) { Link Here
871
        else {
871
        else {
872
            ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
872
            ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
873
        }
873
        }
874
        if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view")){
874
        if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){
875
	    if ($frameworkcode eq 'FA'){
875
	    if ($frameworkcode eq 'FA'){
876
		print $input->redirect(
876
		print $input->redirect(
877
            '/cgi-bin/koha/cataloguing/additem.pl?'
877
            '/cgi-bin/koha/cataloguing/additem.pl?'
Lines 892-898 if ( $op eq "addbiblio" ) { Link Here
892
		exit;
892
		exit;
893
	    }
893
	    }
894
        }
894
        }
895
	elsif($is_a_modif || $redirect eq "view"){
895
	elsif(($is_a_modif || $redirect eq "view") && $redirect ne "just_save"){
896
            my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
896
            my $defaultview = C4::Context->preference('IntranetBiblioDefaultView');
897
            my $views = { C4::Search::enabled_staff_search_views };
897
            my $views = { C4::Search::enabled_staff_search_views };
898
            if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
898
            if ($defaultview eq 'isbd' && $views->{can_view_ISBD}) {
Lines 907-912 if ( $op eq "addbiblio" ) { Link Here
907
            exit;
907
            exit;
908
908
909
	}
909
	}
910
	elsif ($redirect eq "just_save"){
911
	    print $input->redirect("/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=$biblionumber&framework=$frameworkcode");
912
	}
910
	else {
913
	else {
911
          $template->param(
914
          $template->param(
912
            biblionumber => $biblionumber,
915
            biblionumber => $biblionumber,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-5 / +5 lines)
Lines 292-305 function Changefwk(FwkList) { Link Here
292
                    <div class="dialog alert">
292
                    <div class="dialog alert">
293
                        <h4>Duplicate record suspected</h4>
293
                        <h4>Duplicate record suspected</h4>
294
                        <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>
294
                        <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>
295
                        [% IF ( CAN_user_editcatalogue_edit_items ) %]<form action="/cgi-bin/koha/cataloguing/additem.pl" method="get">
295
                        [% IF ( CAN_user_editcatalogue_edit_items ) %]<form action="/cgi-bin/koha/cataloguing/additemelliott.pl" method="get">
296
                                                    <input type="hidden" name="biblionumber" value="[% duplicatebiblionumber %]" />
296
                                                    <input type="hidden" name="biblionumber" value="[% duplicatebiblionumber %]" />
297
                                                    <input type="submit" class="edit" value="Yes: Edit existing items" />
297
                                                    <input type="submit" class="edit" value="Yes: Edit existing items" />
298
                                                </form>[% ELSE %]<form action="/cgi-bin/koha/catalogue/detail.pl" method="get">
298
                                                </form>[% ELSE %]<form action="/cgi-bin/koha/catalogue/detailelliott.pl" method="get">
299
                                                    <input type="hidden" name="biblionumber" value="[% duplicatebiblionumber %]" />
299
                                                    <input type="hidden" name="biblionumber" value="[% duplicatebiblionumber %]" />
300
                                                    <input type="submit" value="Yes: View existing items" />
300
                                                    <input type="submit" value="Yes: View existing items" />
301
                                                </form>[% END %]
301
                                                </form>[% END %]
302
                        <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get">
302
                        <form action="/cgi-bin/koha/cataloguing/addbibliolasers.pl" method="get">
303
                        [% 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 %]
303
                        [% 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 %]
304
                        </form>
304
                        </form>
305
                    </div>
305
                    </div>
Lines 351-357 function Changefwk(FwkList) { Link Here
351
351
352
    var savemenu = [
352
    var savemenu = [
353
        { text: _("Save and view record"), value: 1, onclick: {fn:function(){redirect("view");}} },
353
        { text: _("Save and view record"), value: 1, onclick: {fn:function(){redirect("view");}} },
354
        { text: _("Save and edit items"), value: 2, onclick: {fn:function(){redirect("items");}} }
354
        { text: _("Save and edit items"), value: 2, onclick: {fn:function(){redirect("items");}} },
355
        { text: _("Save and continue editing"), value: 3, onclick: {fn:function(){redirect("just_save");}} }
355
    ];
356
    ];
356
[% END %]
357
[% END %]
357
358
358
- 

Return to bug 7883