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

(-)a/cataloguing/addbiblio.pl (-3 / +5 lines)
Lines 503-508 my $breedingid = $input->param('breedingid'); Link Here
503
my $z3950         = $input->param('z3950');
503
my $z3950         = $input->param('z3950');
504
my $mode          = $input->param('mode') // q{};
504
my $mode          = $input->param('mode') // q{};
505
my $frameworkcode = $input->param('frameworkcode');
505
my $frameworkcode = $input->param('frameworkcode');
506
my $is_fast_add   = Koha::BiblioFrameworks->find($frameworkcode)->is_fast_add;
506
my $redirect      = $input->param('redirect');
507
my $redirect      = $input->param('redirect');
507
my $searchid      = $input->param('searchid') // "";
508
my $searchid      = $input->param('searchid') // "";
508
my $dbh           = C4::Context->dbh;
509
my $dbh           = C4::Context->dbh;
Lines 520-526 $frameworkcode = &GetFrameworkCode($biblionumber) Link Here
520
  if ( $biblionumber and not( defined $frameworkcode) and $op ne 'cud-addbiblio' );
521
  if ( $biblionumber and not( defined $frameworkcode) and $op ne 'cud-addbiblio' );
521
522
522
my $userflags =
523
my $userflags =
523
    $frameworkcode eq 'FA'
524
    $frameworkcode eq 'FA' || $is_fast_add
524
    ? [ 'fast_cataloging', 'edit_catalogue' ]
525
    ? [ 'fast_cataloging', 'edit_catalogue' ]
525
    : 'edit_catalogue';
526
    : 'edit_catalogue';
526
527
Lines 567-573 if ($biblionumber) { Link Here
567
    }
568
    }
568
}
569
}
569
570
570
if ($frameworkcode eq 'FA'){
571
if ($frameworkcode eq 'FA' || $is_fast_add){
571
    # We need to grab and set some variables in the template for use on the additems screen
572
    # We need to grab and set some variables in the template for use on the additems screen
572
    $template->param(
573
    $template->param(
573
        'circborrowernumber' => $fa_circborrowernumber,
574
        'circborrowernumber' => $fa_circborrowernumber,
Lines 721-727 if ( $op eq "cud-addbiblio" ) { Link Here
721
            ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
722
            ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
722
        }
723
        }
723
        if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){
724
        if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){
724
	    if ($frameworkcode eq 'FA'){
725
        if ($frameworkcode eq 'FA' || $is_fast_add){
725
		print $input->redirect(
726
		print $input->redirect(
726
            '/cgi-bin/koha/cataloguing/additem.pl?'
727
            '/cgi-bin/koha/cataloguing/additem.pl?'
727
            .'biblionumber='.$biblionumber
728
            .'biblionumber='.$biblionumber
Lines 861-866 if ( $record ne '-1' ) { Link Here
861
$template->param(
862
$template->param(
862
    popup => $mode,
863
    popup => $mode,
863
    frameworkcode => $frameworkcode,
864
    frameworkcode => $frameworkcode,
865
    is_fast_add => $is_fast_add,
864
    itemtype => $frameworkcode,
866
    itemtype => $frameworkcode,
865
    borrowernumber => $loggedinuser,
867
    borrowernumber => $loggedinuser,
866
    tab => scalar $input->param('tab')
868
    tab => scalar $input->param('tab')
(-)a/cataloguing/additem.pl (-6 / +7 lines)
Lines 142-156 my $item_group_description = $input->param('item_group_description'); Link Here
142
my $display_order          = $input->param('item_group_display_order');
142
my $display_order          = $input->param('item_group_display_order');
143
143
144
our $frameworkcode = &GetFrameworkCode($biblionumber);
144
our $frameworkcode = &GetFrameworkCode($biblionumber);
145
my $is_fast_add = Koha::BiblioFrameworks->find($frameworkcode)->is_fast_add;
145
146
146
# Defining which userflag is needing according to the framework currently used
147
# Defining which userflag is needing according to the framework currently used
147
my $userflags;
148
my $userflags;
148
if ( defined $input->param('frameworkcode') ) {
149
if ( defined $input->param('frameworkcode') ) {
149
    $userflags = ( $input->param('frameworkcode') eq 'FA' ) ? "fast_cataloging" : "edit_items";
150
    $userflags = ( $input->param('frameworkcode') eq 'FA' || $is_fast_add ) ? "fast_cataloging" : "edit_items";
150
}
151
}
151
152
152
if ( not defined $userflags ) {
153
if ( not defined $userflags ) {
153
    $userflags = ( $frameworkcode eq 'FA' ) ? "fast_cataloging" : "edit_items";
154
    $userflags = ( $frameworkcode eq 'FA' || $is_fast_add ) ? "fast_cataloging" : "edit_items";
154
}
155
}
155
156
156
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
157
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
Lines 188-194 $restrictededition = 0 if ( $restrictededition != 0 && C4::Context->IsSuperLibra Link Here
188
# In case user has fast cataloging permission (and we're in fast cataloging), editing is not restricted
189
# In case user has fast cataloging permission (and we're in fast cataloging), editing is not restricted
189
$restrictededition = 0
190
$restrictededition = 0
190
    if ( $restrictededition != 0
191
    if ( $restrictededition != 0
191
    && $frameworkcode eq 'FA'
192
    && ($frameworkcode eq 'FA' || $is_fast_add)
192
    && haspermission( $uid, { 'editcatalogue' => 'fast_cataloging' } ) );
193
    && haspermission( $uid, { 'editcatalogue' => 'fast_cataloging' } ) );
193
194
194
our $tagslib = &GetMarcStructure( 1, $frameworkcode );
195
our $tagslib = &GetMarcStructure( 1, $frameworkcode );
Lines 488-494 if ( $op eq "cud-additem" ) { Link Here
488
            undef($current_item);
489
            undef($current_item);
489
        }
490
        }
490
    }
491
    }
491
    if ( $frameworkcode eq 'FA' && $fa_circborrowernumber ) {
492
    if ( ($frameworkcode eq 'FA' || $is_fast_add) && $fa_circborrowernumber ) {
492
        print $input->redirect( '/cgi-bin/koha/circ/circulation.pl?'
493
        print $input->redirect( '/cgi-bin/koha/circ/circulation.pl?'
493
                . 'borrowernumber='
494
                . 'borrowernumber='
494
                . $fa_circborrowernumber
495
                . $fa_circborrowernumber
Lines 781-787 my $subfields = Link Here
781
    }
782
    }
782
    );
783
    );
783
784
784
if ( $frameworkcode eq 'FA' ) {
785
if ( $frameworkcode eq 'FA' || $is_fast_add ) {
785
    my ($barcode_field) = grep { $_->{kohafield} eq 'items.barcode' } @$subfields;
786
    my ($barcode_field) = grep { $_->{kohafield} eq 'items.barcode' } @$subfields;
786
    $barcode_field->{marc_value}->{value} ||= $input->param('barcode');
787
    $barcode_field->{marc_value}->{value} ||= $input->param('barcode');
787
}
788
}
Lines 811-817 $template->param( Link Here
811
);
812
);
812
$template->{'VARS'}->{'searchid'} = $searchid;
813
$template->{'VARS'}->{'searchid'} = $searchid;
813
814
814
if ( $frameworkcode eq 'FA' ) {
815
if ( $frameworkcode eq 'FA' || $is_fast_add ) {
815
816
816
    # fast cataloguing datas
817
    # fast cataloguing datas
817
    $template->param(
818
    $template->param(
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-2 / +1 lines)
Lines 912-918 $(document).ready(function(){ Link Here
912
                [% END %]
912
                [% END %]
913
913
914
                <div id="toolbar" class="btn-toolbar sticky">
914
                <div id="toolbar" class="btn-toolbar sticky">
915
                    [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]
915
                    [% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' || is_fast_add and CAN_user_editcatalogue_fast_cataloging ) %]
916
                        [% IF (circborrowernumber) %][%# fast cataloging must lead to items %]
916
                        [% IF (circborrowernumber) %][%# fast cataloging must lead to items %]
917
                            <!-- Action is under fast cataloging - Save button redirecting to items -->
917
                            <!-- Action is under fast cataloging - Save button redirecting to items -->
918
                            <div class="btn-group"><a href="#" id="saveanditems" class="btn btn-primary"><i class="fa fa-save"></i> Save</a></div>
918
                            <div class="btn-group"><a href="#" id="saveanditems" class="btn btn-primary"><i class="fa fa-save"></i> Save</a></div>
919
- 

Return to bug 32773