From b3b240f9bc7ac2652876c2650806eb61941bfb8f Mon Sep 17 00:00:00 2001 From: Matthias Meusburger Date: Fri, 30 Mar 2012 13:52:38 +0200 Subject: [PATCH] Bug 7673 : New patron permissions This patch adds the following permissions: - editcatalogue.limited_item_edition: Limit item modification to barcode, status and note - editcatalogue.delete_all_items: Delete all items at once - tools.items_limited_batchmod: Limit batch item modification to item status --- cataloguing/additem.pl | 40 ++++++++++++++++---- .../data/mysql/en/mandatory/userpermissions.sql | 3 ++ installer/data/mysql/updatedatabase.pl | 19 ++++++++++ .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 1 - .../prog/en/modules/cataloguing/additem.tt | 9 ++++- tools/batchMod.pl | 7 ++++ 6 files changed, 70 insertions(+), 9 deletions(-) diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl index a8a8649..9f3b8ce 100755 --- a/cataloguing/additem.pl +++ b/cataloguing/additem.pl @@ -35,7 +35,7 @@ use List::MoreUtils qw/any/; use C4::Search; use Storable qw(thaw freeze); use URI::Escape; - +use C4::Members; use MARC::File::XML; use URI::Escape; @@ -103,9 +103,13 @@ sub _increment_barcode { sub generate_subfield_form { - my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $today_iso, $biblionumber, $temp, $loop_data, $i) = @_; + my ($tag, $subfieldtag, $value, $tagslib,$subfieldlib, $branches, $today_iso, $biblionumber, $temp, $loop_data, $i, $limitededition) = @_; - my $frameworkcode = &GetFrameworkCode($biblionumber); + my $frameworkcode = &GetFrameworkCode($biblionumber); + my ($barcodefield, $barcodesubfield) = GetMarcFromKohaField("items.barcode", $frameworkcode); + my ($notesfield, $notessubfield) = GetMarcFromKohaField("items.itemnotes", $frameworkcode); + my ($notforloanfield, $notforloansubfield) = GetMarcFromKohaField("items.notforloan", $frameworkcode); + my %subfield_data; my $dbh = C4::Context->dbh; @@ -154,6 +158,14 @@ sub generate_subfield_form { $value = $input->param('barcode'); } my $attributes_no_value = qq(tabindex="1" id="$subfield_data{id}" name="field_value" class="input_marceditor" size="67" maxlength="$subfield_data{maxlength}" ); + $attributes_no_value .= 'readonly="readonly" ' + if ( + $limitededition + and $subfieldtag ne $barcodesubfield + and $subfieldtag ne $notessubfield + and $subfieldtag ne $notforloansubfield + ); + my $attributes = qq($attributes_no_value value="$value" ); if ( $subfieldlib->{authorised_value} ) { @@ -214,7 +226,7 @@ sub generate_subfield_form { $subfield_data{marc_value} = qq( $authorised_lib{$value}); } else { - $subfield_data{marc_value} =CGI::scrolling_list( # FIXME: factor out scrolling_list + my @scrparam = ( -name => "field_value", -values => \@authorised_values, -default => $value, @@ -226,6 +238,15 @@ sub generate_subfield_form { -id => "tag_".$tag."_subfield_".$subfieldtag."_".$index_subfield, -class => "input_marceditor", ); + + push @scrparam, (-readonly => "readonly"), (-disabled => "disabled") + if ( + $limitededition + and $subfieldtag ne $barcodesubfield + and $subfieldtag ne $notessubfield + and $subfieldtag ne $notforloansubfield + ); + $subfield_data{marc_value} =CGI::scrolling_list(@scrparam); } } @@ -343,6 +364,12 @@ my ($template, $loggedinuser, $cookie) }); +# Does the user have a limited item edition permission? +my $uid = GetMember( borrowernumber => $loggedinuser )->{userid} if ($loggedinuser) ; +my $limitededition = haspermission($uid, {'editcatalogue' => 'limited_item_edition'}) if ($uid); +# In case user is a superlibrarian, edition is not limited +$limitededition = 0 if ($limitededition != 0 && $limitededition->{'superlibrarian'} eq 1); + my $today_iso = C4::Dates->today('iso'); my $tagslib = &GetMarcStructure(1,$frameworkcode); my $record = GetMarcBiblio($biblionumber); @@ -770,8 +797,7 @@ if($itemrecord){ next if subfield_is_koha_internal_p($subfieldtag); next if ($tagslib->{$tag}->{$subfieldtag}->{'tab'} ne "10"); - my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i); - + my $subfield_data = generate_subfield_form($tag, $subfieldtag, $value, $tagslib, $subfieldlib, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i, $limitededition); push @fields, "$tag$subfieldtag"; push (@loop_data, $subfield_data); $i++; @@ -795,7 +821,7 @@ foreach my $tag ( keys %{$tagslib}){ my @values = (undef); @values = $itemrecord->field($tag)->subfield($subtag) if ($itemrecord && defined($itemrecord->field($tag)->subfield($subtag))); for my $value (@values){ - my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i); + my $subfield_data = generate_subfield_form($tag, $subtag, $value, $tagslib, $tagslib->{$tag}->{$subtag}, $branches, $today_iso, $biblionumber, $temp, \@loop_data, $i, $limitededition); push (@loop_data, $subfield_data); $i++; } diff --git a/installer/data/mysql/en/mandatory/userpermissions.sql b/installer/data/mysql/en/mandatory/userpermissions.sql index 8577ef2..583e094 100644 --- a/installer/data/mysql/en/mandatory/userpermissions.sql +++ b/installer/data/mysql/en/mandatory/userpermissions.sql @@ -9,6 +9,8 @@ INSERT INTO permissions (module_bit, code, description) VALUES ( 9, 'edit_catalogue', 'Edit catalog (Modify bibliographic/holdings data)'), ( 9, 'fast_cataloging', 'Fast cataloging'), ( 9, 'edit_items', 'Edit Items'), + ( 9, 'limited_item_edition', 'Limit item modification to barcode, status and note (please note that edit_item is still required)'), + ( 9, 'delete_all_items', 'Delete all items'), (11, 'vendors_manage', 'Manage vendors'), (11, 'contracts_manage', 'Manage contracts'), (11, 'period_manage', 'Manage periods'), @@ -38,6 +40,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES (13, 'batch_upload_patron_images', 'Upload patron images in batch or one at a time'), (13, 'schedule_tasks', 'Schedule tasks to run'), (13, 'items_batchmod', 'Perform batch modification of items'), + (13, 'items_limited_batchmod', 'Limit batch item modification to item status (please note that items_batchmod is still required)'), (13, 'items_batchdel', 'Perform batch deletion of items'), (13, 'manage_csv_profiles', 'Manage CSV export profiles'), (13, 'moderate_tags', 'Moderate patron tags'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f0a9269..20d6bbf 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6532,6 +6532,25 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = "3.09.00.XXX"; +if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { + $dbh->do(qq{ + INSERT INTO permissions (module_bit, code, description) VALUES ('9', 'limited_item_edition', 'Limit item modification to barcode, status and note (please note that edit_item is still required)'); + }); + + $dbh->do(qq{ + INSERT INTO permissions (module_bit, code, description) VALUES ('9', 'delete_all_items', 'Delete all items at once'); + }); + + $dbh->do(qq{ + INSERT INTO permissions (module_bit, code, description) VALUES ('13', 'items_limited_batchmod', 'Limit batch item modification to item status (please note that items_batchmod is still required)'); + }); + + print "Upgrade to $DBversion done (Adds new permissions for cataloguing and batch item modification)\n"; + + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index 2dde5ad..5c03dd6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -133,7 +133,6 @@ CAN_user_serials_create_subscription ) %] [% END %] -
-
+ [% IF (popup) %] diff --git a/tools/batchMod.pl b/tools/batchMod.pl index e416d44..c22b863 100755 --- a/tools/batchMod.pl +++ b/tools/batchMod.pl @@ -33,6 +33,7 @@ use C4::BackgroundJob; use C4::ClassSource; use C4::Dates; use C4::Debug; +use C4::Members; use MARC::File::XML; use List::MoreUtils qw/uniq/; @@ -69,6 +70,11 @@ my ($template, $loggedinuser, $cookie) flagsrequired => $template_flag, }); +# Does the user have a limited item edition permission? +my $uid = GetMember( borrowernumber => $loggedinuser )->{userid} if ($loggedinuser) ; +my $limitededition = haspermission($uid, {'tools' => 'items_limited_batchmod'}) if ($uid); +# In case user is a superlibrarian, edition is not limited +$limitededition = 0 if ($limitededition != 0 && $limitededition->{'superlibrarian'} eq 1); my $today_iso = C4::Dates->today('iso'); $template->param(today_iso => $today_iso); @@ -288,6 +294,7 @@ foreach my $tag (sort keys %{$tagslib}) { # loop through each subfield foreach my $subfield (sort keys %{$tagslib->{$tag}}) { next if subfield_is_koha_internal_p($subfield); + next if ($limitededition && $tagslib->{$tag}->{$subfield}->{'kohafield'} ne 'items.notforloan'); next if ($tagslib->{$tag}->{$subfield}->{'tab'} ne "10"); # barcode and stocknumber are not meant to be batch-modified next if $tagslib->{$tag}->{$subfield}->{'kohafield'} eq 'items.barcode'; -- 1.7.10.4