Attachment #173960 for bug #32773

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

Lines 98-105 my $is_fast_add = Link Here

(-)a/catalogue/detail.pl (-2 / +2 lines)
98	: 0;	98	: 0;
99		99
100	$template->param(	100	$template->param(
101	biblio => $biblio,	101	biblio => $biblio,
102	activetab => $activetab,	102	activetab => $activetab,
103	is_fast_add => $is_fast_add,	103	is_fast_add => $is_fast_add,
104	);	104	);
105		105

Lines 108-116 my $record = $biblio ? $biblio->metadata->record : undef; Link Here

(-)a/catalogue/moredetail.pl (-2 / +2 lines)
108	output_and_exit( $query, $cookie, $template, 'unknown_biblio')	108	output_and_exit( $query, $cookie, $template, 'unknown_biblio')
109	unless $biblio && $record;	109	unless $biblio && $record;
110		110
111	my $fw = GetFrameworkCode($biblionumber);	111	my $fw = GetFrameworkCode($biblionumber);
112	my $is_fast_add = Koha::BiblioFrameworks->find($fw)->is_fast_add;	112	my $is_fast_add = Koha::BiblioFrameworks->find($fw)->is_fast_add;
113	my $all_items = $biblio->items->search_ordered;	113	my $all_items = $biblio->items->search_ordered;
114		114
115	my @items;	115	my @items;
116	my $patron = Koha::Patrons->find( $loggedinuser );	116	my $patron = Koha::Patrons->find( $loggedinuser );




$frameworkcode = &GetFrameworkCode($biblionumber)
  if ( $biblionumber and not( defined $frameworkcode) and $op ne 'cud-addbiblio' );

my $is_fast_add =
    defined $frameworkcode && $frameworkcode ne ''
    ? Koha::BiblioFrameworks->find($frameworkcode)->is_fast_add
    : 0;

    }
}

if ( $frameworkcode eq 'FA' || $is_fast_add ){
    # We need to grab and set some variables in the template for use on the additems screen
    $template->param(
        'circborrowernumber' => $fa_circborrowernumber,

            ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
        }
        if ($redirect eq "items" || ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){
        if ( $frameworkcode eq 'FA' || $is_fast_add ){
		print $input->redirect(
            '/cgi-bin/koha/cataloguing/additem.pl?'
            .'biblionumber='.$biblionumber

    $template->param( title => $title );
}
$template->param(
    popup          => $mode,
    frameworkcode  => $frameworkcode,
    is_fast_add    => $is_fast_add,
    itemtype       => $frameworkcode,
    borrowernumber => $loggedinuser,
    tab            => scalar $input->param('tab')
);
$template->{'VARS'}->{'searchid'} = $searchid;






our $frameworkcode = &GetFrameworkCode($biblionumber);

my $is_fast_add =
    defined $frameworkcode && $frameworkcode ne ''
    ? Koha::BiblioFrameworks->find($frameworkcode)->is_fast_add
    : 0;

# In case user has fast cataloging permission (and we're in fast cataloging), editing is not restricted
$restrictededition = 0
    if ( $restrictededition != 0
    && ( $frameworkcode eq 'FA' || $is_fast_add )
    && haspermission( $uid, { 'editcatalogue' => 'fast_cataloging' } ) );

our $tagslib = &GetMarcStructure( 1, $frameworkcode );

            undef($current_item);
        }
    }
    if ( ( $frameworkcode eq 'FA' || $is_fast_add ) && $fa_circborrowernumber ) {
        print $input->redirect( '/cgi-bin/koha/circ/circulation.pl?'
                . 'borrowernumber='
                . $fa_circborrowernumber
- 

Return to bug 32773

Lines 519-525 $op = $input->param('op') // q{}; Link Here

(-)a/cataloguing/addbiblio.pl (-8 / +8 lines)
519	$frameworkcode = &GetFrameworkCode($biblionumber)	519	$frameworkcode = &GetFrameworkCode($biblionumber)
520	if ( $biblionumber and not( defined $frameworkcode) and $op ne 'cud-addbiblio' );	520	if ( $biblionumber and not( defined $frameworkcode) and $op ne 'cud-addbiblio' );
521		521
522	my $is_fast_add =	522	my $is_fast_add =
523	defined $frameworkcode && $frameworkcode ne ''	523	defined $frameworkcode && $frameworkcode ne ''
524	? Koha::BiblioFrameworks->find($frameworkcode)->is_fast_add	524	? Koha::BiblioFrameworks->find($frameworkcode)->is_fast_add
525	: 0;	525	: 0;
Lines 572-578 if ($biblionumber) { Link Here
572	}	572	}
573	}	573	}
574		574
575	if ($frameworkcode eq 'FA' \|\| $is_fast_add){	575	if ( $frameworkcode eq 'FA' \|\| $is_fast_add ){
576	# We need to grab and set some variables in the template for use on the additems screen	576	# We need to grab and set some variables in the template for use on the additems screen
577	$template->param(	577	$template->param(
578	'circborrowernumber' => $fa_circborrowernumber,	578	'circborrowernumber' => $fa_circborrowernumber,
Lines 726-732 if ( $op eq "cud-addbiblio" ) { Link Here
726	( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );	726	( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
727	}	727	}
728	if ($redirect eq "items" \|\| ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){	728	if ($redirect eq "items" \|\| ($mode ne "popup" && !$is_a_modif && $redirect ne "view" && $redirect ne "just_save")){
729	if ($frameworkcode eq 'FA' \|\| $is_fast_add){	729	if ( $frameworkcode eq 'FA' \|\| $is_fast_add ){
730	print $input->redirect(	730	print $input->redirect(
731	'/cgi-bin/koha/cataloguing/additem.pl?'	731	'/cgi-bin/koha/cataloguing/additem.pl?'
732	.'biblionumber='.$biblionumber	732	.'biblionumber='.$biblionumber
Lines 864-875 if ( $record ne '-1' ) { Link Here
864	$template->param( title => $title );	864	$template->param( title => $title );
865	}	865	}
866	$template->param(	866	$template->param(
867	popup => $mode,	867	popup => $mode,
868	frameworkcode => $frameworkcode,	868	frameworkcode => $frameworkcode,
869	is_fast_add => $is_fast_add,	869	is_fast_add => $is_fast_add,
870	itemtype => $frameworkcode,	870	itemtype => $frameworkcode,
871	borrowernumber => $loggedinuser,	871	borrowernumber => $loggedinuser,
872	tab => scalar $input->param('tab')	872	tab => scalar $input->param('tab')
873	);	873	);
874	$template->{'VARS'}->{'searchid'} = $searchid;	874	$template->{'VARS'}->{'searchid'} = $searchid;
875		875

Lines 143-149 my $display_order = $input->param('item_group_display_order'); Link Here

(-)a/cataloguing/additem.pl (-4 / +3 lines)
143		143
144	our $frameworkcode = &GetFrameworkCode($biblionumber);	144	our $frameworkcode = &GetFrameworkCode($biblionumber);
145		145
146	my $is_fast_add =	146	my $is_fast_add =
147	defined $frameworkcode && $frameworkcode ne ''	147	defined $frameworkcode && $frameworkcode ne ''
148	? Koha::BiblioFrameworks->find($frameworkcode)->is_fast_add	148	? Koha::BiblioFrameworks->find($frameworkcode)->is_fast_add
149	: 0;	149	: 0;
Lines 193-199 $restrictededition = 0 if ( $restrictededition != 0 && C4::Context->IsSuperLibra Link Here
193	# In case user has fast cataloging permission (and we're in fast cataloging), editing is not restricted	193	# In case user has fast cataloging permission (and we're in fast cataloging), editing is not restricted
194	$restrictededition = 0	194	$restrictededition = 0
195	if ( $restrictededition != 0	195	if ( $restrictededition != 0
196	&& ($frameworkcode eq 'FA' \|\| $is_fast_add)	196	&& ( $frameworkcode eq 'FA' \|\| $is_fast_add )
197	&& haspermission( $uid, { 'editcatalogue' => 'fast_cataloging' } ) );	197	&& haspermission( $uid, { 'editcatalogue' => 'fast_cataloging' } ) );
198		198
199	our $tagslib = &GetMarcStructure( 1, $frameworkcode );	199	our $tagslib = &GetMarcStructure( 1, $frameworkcode );
Lines 493-499 if ( $op eq "cud-additem" ) { Link Here
493	undef($current_item);	493	undef($current_item);
494	}	494	}
495	}	495	}
496	if ( ($frameworkcode eq 'FA' \|\| $is_fast_add) && $fa_circborrowernumber ) {	496	if ( ( $frameworkcode eq 'FA' \|\| $is_fast_add ) && $fa_circborrowernumber ) {
497	print $input->redirect( '/cgi-bin/koha/circ/circulation.pl?'	497	print $input->redirect( '/cgi-bin/koha/circ/circulation.pl?'
498	. 'borrowernumber='	498	. 'borrowernumber='
499	. $fa_circborrowernumber	499	. $fa_circborrowernumber
500	-