@@ -, +, @@ record --- cataloguing/addbiblio.pl | 7 ++++--- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) --- a/cataloguing/addbiblio.pl +++ a/cataloguing/addbiblio.pl @@ -727,14 +727,15 @@ my $fa_stickyduedate = $input->param('stickyduedate'); my $fa_duedatespec = $input->param('duedatespec'); my $userflags = 'edit_catalogue'; -if ($frameworkcode eq 'FA'){ - $userflags = 'fast_cataloging'; -} my $changed_framework = $input->param('changed_framework'); $frameworkcode = &GetFrameworkCode($biblionumber) if ( $biblionumber and not($frameworkcode) and $op ne 'addbiblio' ); +if ($frameworkcode eq 'FA'){ + $userflags = 'fast_cataloging'; +} + $frameworkcode = '' if ( $frameworkcode eq 'Default' ); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -27,7 +27,7 @@ function addToShelf() { window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=[% biblionumber %]','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); } function printBiblio() {window.print(); } -[% IF ( CAN_user_editcatalogue_edit_catalogue ) %] +[% IF CAN_user_editcatalogue_edit_catalogue or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] function confirm_deletion() { var count = [% count %]; var holdcount = [% holdcount %]; @@ -68,7 +68,7 @@ } [% END %] -[% IF ( CAN_user_editcatalogue_edit_items ) %] +[% IF CAN_user_editcatalogue_edit_items or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %] function confirm_items_deletion() { var count = [% count %]; var holdcount = [% holdcount %]; @@ -159,15 +159,15 @@ CAN_user_serials_create_subscription ) %] [% END %] -[% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel ) %] +[% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_tools_items_batchmod || CAN_user_tools_items_batchdel ) or ( frameworkcode == 'FA' and CAN_user_editcatalogue_fast_cataloging ) %]