Koha › [% IF ( viewshelf ) %]Lists › Contents of [% shelfname | html %][% ELSE %]Lists[% END %][% IF ( shelves ) %] › Create new list[% END %][% IF ( edit ) %] › Edit list [% shelfname

@@ -318,70 +316,53 @@ function placeHold () { [% CASE 'error_on_insert' %] An error occurred when inserting this list. Perhaps the name already exists. [% CASE 'error_on_delete' %] - An error occurred when deleteing this list. Check the logs. + An error occurred when deleting this list. Check the logs. + [% CASE 'error_on_add_biblio' %] + The item has not been added to the list. Please check it's not in this list yet. [% CASE 'success_on_update' %] List updated with success. [% CASE 'success_on_insert' %] List inserted with success. [% CASE 'success_on_delete' %] List deleted with success. - [% CASE 'Koha::Exception::DuplicateObject' %] + [% CASE 'success_on_add_biblio' %] + The item has been added to the list. + [% CASE 'success_on_remove_biblios' %] + The item has been removed from the list. + [% CASE 'does_not_exist' %] + This list does not exist. + [% CASE 'item_does_not_exist' %] + This item does not exist. + [% CASE 'unauthorized_on_view' %] + You do not have permission to view this list. + [% CASE 'unauthorized_on_update' %] + You do not have permission to update this list. + [% CASE 'unauthorized_on_delete' %] + You do not have permission to delete this list. + [% CASE 'unauthorized_on_add_biblio' %] + You do not have permission to add a biblio to this list. + [% CASE 'no_biblio_removed' %] + No biblio has been removed. + [% CASE 'Koha::Exceptions::Virtualshelves::DuplicateObject' %] An error occurred when inserting this list. The name already [% shelfname %] exists. + [% CASE 'DBIx::Class::Exception' %] + [% m.msg %] [% CASE %] [% m.code %] [% END %]

[% END %] -[% IF ( paramsloop ) %] -[% FOREACH paramsloo IN paramsloop %] -

- [% IF ( paramsloo.status ) %]

[% paramsloo.string %]

[% END %] - [% IF ( paramsloo.nobarcode ) %]

ERROR: No barcode given.

[% END %] - [% IF ( paramsloo.noshelfnumber ) %]

ERROR: No list number given.

[% END %] - [% IF ( paramsloo.need_confirm ) %] -

The list [% paramsloo.need_confirm %] is not empty. - [% IF ( paramsloo.single ) %] -
It has [% paramsloo.count %] entry. - [% ELSE %] -
It has [% paramsloo.count %] entries. - [% END %] -
Use the "Confirm" button below to confirm deletion. -

- [% END %] - [% IF ( paramsloo.nopermission ) %] -

ERROR: You do not have adequate permission for that action on list [% paramsloo.nopermission %].

- [% END %] - [% IF ( paramsloo.failgetitem ) %] -

ERROR: No item found with barcode [% paramsloo.failgetitem %].

- [% END %] - [% IF ( paramsloo.duplicatebiblio ) %] -

A record matching barcode [% paramsloo.duplicatebiblio %] has already been added.

- [% END %] - [% IF ( paramsloo.nothingdeleted) %] -

Warning: You could not delete any of the selected items from this list.

- [% END %] - [% IF ( paramsloo.somedeleted) %] -

Warning: You could not delete all selected items from this list.

- [% END %] - [% IF ( paramsloo.modifyfailure) %] -

ERROR: List could not be modified.

- [% END %] -

-[% END %] -[% END %] - -[% IF ( viewshelf ) %] +[% IF op == 'view' %]

- [% IF ( itemsloop ) %] + [% IF itemsloop %] -

Contents of [% shelfname | html %]

Contents of [% shelf.shelfname | html %]

[% pagination_bar %]

- - + + + [% IF direction == 'asc' %] [% SET new_direction = 'desc' %] @@ -391,16 +372,16 @@ function placeHold () { [% END %]

- [% IF ( itemsloop ) %] + [% IF itemsloop %]

| | - [% IF ( CAN_user_reserveforothers && DisplayMultiPlaceHold ) %] + [% IF CAN_user_reserveforothers && Koha.Preference('DisplayMultiPlaceHold') %]

[% END %] - [% IF ( allowremovingitems ) %] + [% IF can_remove_biblios %]

[% END %] [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]

[% END %] @@ -414,16 +395,16 @@ function placeHold () { [% UNLESS ( item_level_itypes ) %]Item type[% END %] - Title - [% IF sort == 'title' %] + Title + [% IF sortfield == 'title' %] [% direction %] sort

[% ELSE %]

[% END %] - Author - [% IF sort == 'author' %] + Author + [% IF sortfield == 'author' %] [% direction %] sort

[% ELSE %]

@@ -431,30 +412,25 @@ function placeHold () { Date added - Call number - [% IF sort == 'itemcallnumber' %] + Call number + [% IF sortfield == 'itemcallnumber' %] [% direction %] sort

[% ELSE %]

[% END %] - [% FOREACH itemsloo IN itemsloop %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - - [% END %] - [% IF ( itemsloop ) %] - - [% IF ( itemsloo.confirm ) %] - - - [% ELSE %] - - [% END %] - - [% END %] + [% FOREACH itemsloo IN itemsloop %] + [% UNLESS ( loop.odd ) %] + + [% ELSE %] + + [% END %] + [% IF itemsloop %] + + + + [% END %] [% UNLESS ( item_level_itypes ) %] [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %]

[% END %][% itemsloo.description %] [% END %] @@ -483,10 +459,10 @@ function placeHold () { | Edit items [% END %]

- - [% itemsloo.author %] - [% itemsloo.dateadded %] - + + [% itemsloo.author %] + [% itemsloo.dateadded | $KohaDates%] +

[% result.holdingbranch %] [% IF ( result.location_intranet ) %] ([% result.location_intranet %]) [% END %] @@ -505,88 +481,111 @@ function placeHold () { [% END %]

-[% END %] +[% END %] -[% IF ( debug ) %] - [% IF ( edit ) %]

Edit is on ([% shelfname | html %])

[% END %] - [% IF ( seflag ) %]

seflag is on ([% seflag %])

[% END %] +[% IF can_add_biblios %] +

+ +

+ Add an item to [% shelfname | html %] +

+ Barcode: + + + + + +

+ +

[% END %] -[% IF ( seflag ) %] +[% IF op == 'add_form' OR op == 'edit_form' %]

- [% IF ( shelves ) %] - Create a new list - + [% IF op == 'add_form' %] + Create a new list + + [% ELSE %] + Edit list [% shelf.shelfname | html %] + + [% END %] + +

List name: +
+ Name: Required -
Owner: [% loggedinusername %]
Sort this list by: -
Category: -

- [% END %] - - [% IF ( edit ) %] - Edit list [% shelfname | html %] - - - [% IF ( showprivateshelves ) %][% END %] - -

Name: - Required -
Owner: [% IF ( owner ) %][% ownername %][% ELSE %][% loggedinusername %][% END %]
Sort this list by: -
Category: -

- [% END %] + +

+ Owner: + [% IF op == 'add_form' %] + [% loggedinusername %]

+ [% ELSE %] + [% IF owner %] + [% owner.firstname _ ' ' _ owner.surname %] + [% ELSE %] + [% loggedinusername %] + [% END %] + [% END %] + +

Sort this list by: +

Category: +

+ [% FOR permission IN ['allow_add', 'allow_delete_own', 'allow_delete_other'] %] +

+ [% IF loop.first %] + Permissions: + [% ELSE %] + + [% END %] + + [% SWITCH permission %] + [% CASE 'allow_add' %] anyone else to add entries. + [% CASE 'allow_delete_own' %] anyone to remove his own contributed entries. + [% CASE 'allow_delete_other' %] anyone to remove other contributed entries. + [% END %] +

+ [% END %] + + -

- [% IF ( showprivateshelves ) %] - Cancel - [% ELSE %] - [% IF ( display == "viewshelf" ) %] - Cancel +

+ + [% IF referer == 'view' %] + Cancel + [% ELSE %] + [% IF category == PUBLIC %] + Cancel [% ELSE %] - Cancel + Cancel [% END %] [% END %]

@@ -601,7 +600,7 @@ function placeHold () {

-[% END %] +[% END %] [% IF op == 'list' %]

Lists

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt index 646b3b4685..08d75a6868 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt @@ -10,7 +10,7 @@ "dt_type": "[% data.type %]", "dt_shelfname": - "[% data.shelfname | html%]", + "[% data.shelfname | html%]", "dt_count": "[% data.count %] item(s)", "dt_owner": @@ -34,7 +34,8 @@ [%~ IF can_manage_shelf ~%] [%~ action_block = '' ~%] [%~ action_block = action_block _ '' ~%] - [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] + [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] [%~ action_block = action_block _ '' ~%] [%~ END ~%] @@ -42,13 +43,9 @@ [%~ action_block = action_block _ '' ~%] [%~ END ~%] diff --git a/t/db_dependent/Virtualshelves.t b/t/db_dependent/Virtualshelves.t index 36e61880fb..aa8b3235f2 100644 --- a/t/db_dependent/Virtualshelves.t +++ b/t/db_dependent/Virtualshelves.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use Modern::Perl; -use Test::More tests => 3; +use Test::More tests => 4; use DateTime::Duration; use C4::Context; @@ -236,3 +236,108 @@ subtest 'Shelf content' => sub { $number_of_contents = Koha::Virtualshelfcontents->search->count; is( $number_of_contents, 1, 'The biblio should have been deleted to the shelf by the patron 2, even if it is not his own content (allow_delete_other=1)' ); }; + +subtest 'Shelf permissions' => sub { + + plan tests => 40; + my $patron1 = $builder->build( { source => 'Borrower', value => { flags => '2096766' } } ); # 2096766 is everything checked but not superlibrarian + my $patron2 = $builder->build( { source => 'Borrower', value => { flags => '1048190' } } ); # 1048190 is everything checked but not superlibrarian and delete_public_lists + my $biblio1 = $builder->build( { source => 'Biblio', } ); + my $biblio2 = $builder->build( { source => 'Biblio', } ); + my $biblio3 = $builder->build( { source => 'Biblio', } ); + my $biblio4 = $builder->build( { source => 'Biblio', } ); + + + my $public_shelf = Koha::Virtualshelf->new( + { shelfname => "my first shelf", + owner => $patron1->{borrowernumber}, + category => 2, + allow_add => 0, + allow_delete_own => 0, + allow_delete_other => 0, + } + )->store; + + is( $public_shelf->can_be_viewed( $patron1->{borrowernumber} ), 1, 'The owner should be able to view his public list' ); + is( $public_shelf->can_be_viewed( $patron2->{borrowernumber} ), 1, 'Public list should be viewed by someone else' ); + + is( $public_shelf->can_be_deleted( $patron1->{borrowernumber} ), 1, 'The owner should be able to delete his list' ); + is( $public_shelf->can_be_deleted( $patron2->{borrowernumber} ), 0, 'Public list should not be deleted by someone else' ); + + is( $public_shelf->can_be_managed( $patron1->{borrowernumber} ), 1, 'The owner should be able to manage his list' ); + is( $public_shelf->can_be_managed( $patron2->{borrowernumber} ), 0, 'Public list should not be managed by someone else' ); + + is( $public_shelf->can_biblios_be_added( $patron1->{borrowernumber} ), 1, 'The owner should be able to add biblios to his list' ); + is( $public_shelf->can_biblios_be_added( $patron2->{borrowernumber} ), 0, 'Public list should not be modified (add) by someone else' ); + + is( $public_shelf->can_biblios_be_removed( $patron1->{borrowernumber} ), 1, 'The owner should be able to remove biblios to his list' ); + is( $public_shelf->can_biblios_be_removed( $patron2->{borrowernumber} ), 0, 'Public list should not be modified (remove) by someone else' ); + + + $public_shelf->allow_add(1); + $public_shelf->allow_delete_own(1); + $public_shelf->allow_delete_other(1); + $public_shelf->store; + + is( $public_shelf->can_be_viewed( $patron1->{borrowernumber} ), 1, 'The owner should be able to view his public list' ); + is( $public_shelf->can_be_viewed( $patron2->{borrowernumber} ), 1, 'Public list should be viewed by someone else' ); + + is( $public_shelf->can_be_deleted( $patron1->{borrowernumber} ), 1, 'The owner should be able to delete his list' ); + is( $public_shelf->can_be_deleted( $patron2->{borrowernumber} ), 0, 'Public list should not be deleted by someone else' ); + + is( $public_shelf->can_be_managed( $patron1->{borrowernumber} ), 1, 'The owner should be able to manage his list' ); + is( $public_shelf->can_be_managed( $patron2->{borrowernumber} ), 0, 'Public list should not be managed by someone else' ); + + is( $public_shelf->can_biblios_be_added( $patron1->{borrowernumber} ), 1, 'The owner should be able to add biblios to his list' ); + is( $public_shelf->can_biblios_be_added( $patron2->{borrowernumber} ), 1, 'Public list should not be modified (add) by someone else' ); + + is( $public_shelf->can_biblios_be_removed( $patron1->{borrowernumber} ), 1, 'The owner should be able to remove biblios to his list' ); + is( $public_shelf->can_biblios_be_removed( $patron2->{borrowernumber} ), 1, 'Public list should not be modified (remove) by someone else' ); + + + my $private_shelf = Koha::Virtualshelf->new( + { shelfname => "my first shelf", + owner => $patron1->{borrowernumber}, + category => 1, + allow_add => 0, + allow_delete_own => 0, + allow_delete_other => 0, + } + )->store; + + is( $private_shelf->can_be_viewed( $patron1->{borrowernumber} ), 1, 'The owner should be able to view his list' ); + is( $private_shelf->can_be_viewed( $patron2->{borrowernumber} ), 0, 'Private list should not be viewed by someone else' ); + + is( $private_shelf->can_be_deleted( $patron1->{borrowernumber} ), 1, 'The owner should be able to delete his list' ); + is( $private_shelf->can_be_deleted( $patron2->{borrowernumber} ), 0, 'Private list should not be deleted by someone else' ); + + is( $private_shelf->can_be_managed( $patron1->{borrowernumber} ), 1, 'The owner should be able to manage his list' ); + is( $private_shelf->can_be_managed( $patron2->{borrowernumber} ), 0, 'Private list should not be managed by someone else' ); + + is( $private_shelf->can_biblios_be_added( $patron1->{borrowernumber} ), 1, 'The owner should be able to add biblios to his list' ); + is( $private_shelf->can_biblios_be_added( $patron2->{borrowernumber} ), 0, 'Private list should not be modified (add) by someone else' ); + + is( $private_shelf->can_biblios_be_removed( $patron1->{borrowernumber} ), 1, 'The owner should be able to remove biblios to his list' ); + is( $private_shelf->can_biblios_be_removed( $patron2->{borrowernumber} ), 0, 'Private list should not be modified (remove) by someone else' ); + + + $private_shelf->allow_add(1); + $private_shelf->allow_delete_own(1); + $private_shelf->allow_delete_other(1); + $private_shelf->store; + + is( $private_shelf->can_be_viewed( $patron1->{borrowernumber} ), 1, 'The owner should be able to view his list' ); + is( $private_shelf->can_be_viewed( $patron2->{borrowernumber} ), 0, 'Private list should not be viewed by someone else' ); + + is( $private_shelf->can_be_deleted( $patron1->{borrowernumber} ), 1, 'The owner should be able to delete his list' ); + is( $private_shelf->can_be_deleted( $patron2->{borrowernumber} ), 0, 'Private list should not be deleted by someone else' ); + + is( $private_shelf->can_be_managed( $patron1->{borrowernumber} ), 1, 'The owner should be able to manage his list' ); + is( $private_shelf->can_be_managed( $patron2->{borrowernumber} ), 0, 'Private list should not be managed by someone else' ); + + is( $private_shelf->can_biblios_be_added( $patron1->{borrowernumber} ), 1, 'The owner should be able to add biblios to his list' ); + is( $private_shelf->can_biblios_be_added( $patron2->{borrowernumber} ), 1, 'Private list could be modified (add) by someone else # individual check done later' ); + + is( $private_shelf->can_biblios_be_removed( $patron1->{borrowernumber} ), 1, 'The owner should be able to remove biblios to his list' ); + is( $private_shelf->can_biblios_be_removed( $patron2->{borrowernumber} ), 1, 'Private list could be modified (remove) by someone else # individual check done later' ); +}; diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl index 37d300ef9f..e6a16304e5 100755 --- a/virtualshelves/addbybiblionumber.pl +++ b/virtualshelves/addbybiblionumber.pl @@ -155,7 +155,8 @@ sub HandleNewVirtualShelf { } sub HandleShelfNumber { - if($authorized= ShelfPossibleAction($loggedinuser, $shelfnumber, 'add')) { + my $shelf = Koha::Virtualshelves->find( $shelfnumber ); + if($authorized = $shelf->can_biblios_be_added( $loggedinuser ) ) { AddBibliosToShelf($shelfnumber, @biblionumber); #Close this page and return print $query->header; @@ -167,9 +168,9 @@ sub HandleShelfNumber { } sub HandleSelectedShelf { - if($authorized= ShelfPossibleAction( $loggedinuser, $shelfnumber, 'add')){ + my $shelf = Koha::Virtualshelves->find( $shelfnumber ); + if($authorized = $shelf->can_biblios_be_added( $loggedinuser ) ) { #confirm adding to specific shelf - my $shelf = Koha::Virtualshelves->find( $shelfnumber ); $template->param( singleshelf => 1, shelfnumber => $shelf->shelfnumber, diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl index 0f9034094b..156e261c2c 100755 --- a/virtualshelves/downloadshelf.pl +++ b/virtualshelves/downloadshelf.pl @@ -31,10 +31,13 @@ use C4::VirtualShelves; use C4::Record; use C4::Ris; use C4::Csv; + +use Koha::Virtualshelves; + use utf8; my $query = new CGI; -my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( +my ( $template, $loggedinuser, $cookie ) = get_template_and_user ( { template_name => "virtualshelves/downloadshelf.tt", query => $query, @@ -47,6 +50,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( my $shelfid = $query->param('shelfid'); my $format = $query->param('format'); my $dbh = C4::Context->dbh; +my @messages; if ($shelfid && $format) { @@ -54,41 +58,52 @@ if ($shelfid && $format) { my $marcflavour = C4::Context->preference('marcflavour'); my $output=''; - # CSV - if ($format =~ /^\d+$/) { - my @biblios; - foreach (@$items) { - push @biblios, $_->{biblionumber}; - } - $output = marc2csv(\@biblios, $format); - } - else { #Other formats - foreach my $biblio (@$items) { - my $biblionumber = $biblio->{biblionumber}; - my $record = GetMarcBiblio($biblionumber, 1); - if ($format eq 'iso2709') { - $output .= $record->as_usmarc(); - } - elsif ($format eq 'ris') { - $output .= marc2ris($record); + my $shelf = Koha::Virtualshelves->find($shelfid); + if ( $shelf ) { + if ( $shelf->can_be_viewed( $loggedinuser ) ) { + + # CSV + if ($format =~ /^\d+$/) { + my @biblios; + foreach (@$items) { + push @biblios, $_->{biblionumber}; + } + $output = marc2csv(\@biblios, $format); } - elsif ($format eq 'bibtex') { - $output .= marc2bibtex($record, $biblionumber); + else { #Other formats + foreach my $biblio (@$items) { + my $biblionumber = $biblio->{biblionumber}; + my $record = GetMarcBiblio($biblionumber, 1); + if ($format eq 'iso2709') { + $output .= $record->as_usmarc(); + } + elsif ($format eq 'ris') { + $output .= marc2ris($record); + } + elsif ($format eq 'bibtex') { + $output .= marc2bibtex($record, $biblionumber); + } + } } + print $query->header( + -type => 'application/octet-stream', + -'Content-Transfer-Encoding' => 'binary', + -attachment=>"shelf.$format"); + print $output; + exit; + } else { + push @messages, { type => 'error', code => 'unauthorized' }; } + } else { + push @messages, { type => 'error', code => 'does_not_exist' }; } # If it was a CSV export we change the format after the export so the file extension is fine $format = "csv" if ($format =~ m/^\d+$/); - - print $query->header( - -type => 'application/octet-stream', - -'Content-Transfer-Encoding' => 'binary', - -attachment=>"shelf.$format"); - print $output; } else { $template->param(csv_profiles => GetCsvProfilesLoop('marc')); $template->param(shelfid => $shelfid); - output_html_with_http_headers $query, $cookie, $template->output; } +$template->param( messages => \@messages ); +output_html_with_http_headers $query, $cookie, $template->output; diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl index 43ae72a11b..8e7ecc0308 100755 --- a/virtualshelves/shelves.pl +++ b/virtualshelves/shelves.pl @@ -1,7 +1,6 @@ #!/usr/bin/perl -# -# Copyright 2000-2002 Katipo Communications +# Copyright 2015 Koha Team # # This file is part of Koha. # @@ -18,22 +17,263 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; use CGI qw ( -utf8 ); -use C4::VirtualShelves::Page; +use C4::VirtualShelves; use C4::Auth; +use C4::Biblio; +use C4::Csv; +use C4::Koha; +use C4::Items; +use C4::Members; +use C4::Output; +use C4::XSLT; +use Koha::Virtualshelves; my $query = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { - template_name => "virtualshelves/shelves.tt", + { template_name => "virtualshelves/shelves.tt", query => $query, type => "intranet", authnotrequired => 0, flagsrequired => { catalogue => 1 }, } ); -$template->param( print => $query->param('print') ); -shelfpage('intranet', $query, $template, $loggedinuser, $cookie); + +my $op = $query->param('op') || 'list'; +my $referer = $query->param('referer') || $op; +my $category = $query->param('category') || 1; +my ( $shelf, $shelfnumber, @messages ); + +if ( $op eq 'add_form' ) { + # Nothing to do +} elsif ( $op eq 'edit_form' ) { + $shelfnumber = $query->param('shelfnumber'); + $shelf = Koha::Virtualshelves->find($shelfnumber); + + if ( $shelf ) { + $category = $shelf->category; + my $patron = GetMember( 'borrowernumber' => $shelf->owner ); + $template->param( owner => $patron, ); + unless ( $shelf->can_be_managed( $loggedinuser ) ) { + push @messages, { type => 'error', code => 'unauthorized_on_update' }; + $op = 'list'; + } + } else { + push @messages, { type => 'error', code => 'does_not_exist' }; + } +} elsif ( $op eq 'add' ) { + eval { + $shelf = Koha::Virtualshelf->new( + { shelfname => $query->param('shelfname'), + sortfield => $query->param('sortfield'), + category => $query->param('category'), + allow_add => $query->param('allow_add'), + allow_delete_own => $query->param('allow_delete_own'), + allow_delete_other => $query->param('allow_delete_other'), + owner => $query->param('owner'), + } + ); + $shelf->store; + $shelfnumber = $shelf->shelfnumber; + }; + if ($@) { + push @messages, { type => 'error', code => ref($@), msg => $@ }; + } elsif ( not $shelf ) { + push @messages, { type => 'error', code => 'error_on_insert' }; + } else { + push @messages, { type => 'message', code => 'success_on_insert' }; + $op = 'view'; + } +} elsif ( $op eq 'edit' ) { + $shelfnumber = $query->param('shelfnumber'); + $shelf = Koha::Virtualshelves->find($shelfnumber); + + if ( $shelf ) { + $op = $referer; + if ( $shelf->can_be_managed( $loggedinuser ) ) { + $shelf->shelfname( $query->param('shelfname') ); + $shelf->sortfield( $query->param('sortfield') ); + $shelf->allow_add( $query->param('allow_add') ); + $shelf->allow_delete_own( $query->param('allow_delete_own') ); + $shelf->allow_delete_other( $query->param('allow_delete_other') ); + $shelf->category( $query->param('category') ); + eval { $shelf->store }; + + if ($@) { + push @messages, { type => 'error', code => 'error_on_update' }; + $op = 'edit_form'; + } else { + push @messages, { type => 'message', code => 'success_on_update' }; + } + } else { + push @messages, { type => 'error', code => 'unauthorized_on_update' }; + } + } else { + push @messages, { type => 'error', code => 'does_not_exist' }; + } +} elsif ( $op eq 'delete' ) { + $shelfnumber = $query->param('shelfnumber'); + $shelf = Koha::Virtualshelves->find($shelfnumber); + if ($shelf) { + if ( $shelf->can_be_deleted( $loggedinuser ) ) { + eval { $shelf->delete; }; + if ($@) { + push @messages, { type => 'error', code => ref($@), msg => $@ }; + } else { + push @messages, { type => 'message', code => 'success_on_delete' }; + } + } else { + push @messages, { type => 'error', code => 'unauthorized_on_delete' }; + } + } else { + push @messages, { type => 'error', code => 'does_not_exist' }; + } + $op = 'list'; +} elsif ( $op eq 'add_biblio' ) { + $shelfnumber = $query->param('shelfnumber'); + $shelf = Koha::Virtualshelves->find($shelfnumber); + if ($shelf) { + if( my $barcode = $query->param('barcode') ) { + my $item = GetItem( 0, $barcode); + if (defined $item && $item->{itemnumber}) { + my $biblio = GetBiblioFromItemNumber( $item->{itemnumber} ); + if ( $shelf->can_biblios_be_added( $loggedinuser ) ) { + my $added = eval { $shelf->add_biblio( $biblio->{biblionumber}, $loggedinuser ); }; + if ($@) { + push @messages, { type => 'error', code => ref($@), msg => $@ }; + } elsif ( $added ) { + push @messages, { type => 'message', code => 'success_on_add_biblio' }; + } else { + push @messages, { type => 'message', code => 'error_on_add_biblio' }; + } + } else { + push @messages, { type => 'error', code => 'unauthorized_on_add_biblio' }; + } + } else { + push @messages, { type => 'error', code => 'item_does_not_exist' }; + } + } + } else { + push @messages, { type => 'error', code => 'does_not_exist' }; + } + $op = $referer; +} elsif ( $op eq 'remove_biblios' ) { + $shelfnumber = $query->param('shelfnumber'); + $shelf = Koha::Virtualshelves->find($shelfnumber); + my @biblionumbers = $query->param('biblionumber'); + if ($shelf) { + if ( $shelf->can_biblios_be_removed( $loggedinuser ) ) { + my $number_of_biblios_removed = eval { + $shelf->remove_biblios( + { + biblionumbers => \@biblionumbers, + borrowernumber => $loggedinuser, + } + ); + }; + if ($@) { + push @messages, { type => 'error', code => ref($@), msg => $@ }; + } elsif ( $number_of_biblios_removed ) { + push @messages, { type => 'message', code => 'success_on_remove_biblios' }; + } else { + push @messages, { type => 'error', code => 'no_biblio_removed' }; + } + } else { + push @messages, { type => 'error', code => 'unauthorized_on_remove_biblios' }; + } + } else { + push @messages, { type => 'error', code => 'does_not_exist' }; + } + $op = $referer; +} + +if ( $op eq 'view' ) { + $shelfnumber ||= $query->param('shelfnumber'); + $shelf = Koha::Virtualshelves->find($shelfnumber); + if ( $shelf ) { + if ( $shelf->can_be_viewed( $loggedinuser ) ) { + my $sortfield = $query->param('sortfield') || $shelf->sortfield; # Passed in sorting overrides default sorting + my $direction = $query->param('direction') || 'asc'; + my ( $shelflimit, $shelfoffset, $itemoff ); + unless ( $query->param('print') ) { + $shelflimit = C4::Context->preference('numSearchResults') || 20; + $itemoff = ( $query->param('itemoff') ? $query->param('itemoff') : 1 ); + $shelfoffset = ( $itemoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving items at + } + my ( $items, $totitems ) = GetShelfContents( $shelfnumber, $shelflimit, $shelfoffset, $sortfield, $direction ); + + my $borrower = GetMember( borrowernumber => $loggedinuser ); + + for my $this_item (@$items) { + my $biblionumber = $this_item->{biblionumber}; + my $record = GetMarcBiblio($biblionumber); + + if ( C4::Context->preference("XSLTResultsDisplay") ) { + $this_item->{XSLTBloc} = XSLTParse4Display( $biblionumber, $record, "XSLTResultsDisplay" ); + } + + my $marcflavour = C4::Context->preference("marcflavour"); + $this_item->{'imageurl'} = getitemtypeinfo( $this_item->{'itemtype'}, 'intranet' )->{'imageurl'}; + $this_item->{'coins'} = GetCOinSBiblio($record); + $this_item->{'subtitle'} = GetRecordValue( 'subtitle', $record, GetFrameworkCode( $this_item->{'biblionumber'} ) ); + $this_item->{'normalized_upc'} = GetNormalizedUPC( $record, $marcflavour ); + $this_item->{'normalized_ean'} = GetNormalizedEAN( $record, $marcflavour ); + $this_item->{'normalized_oclc'} = GetNormalizedOCLCNumber( $record, $marcflavour ); + $this_item->{'normalized_isbn'} = GetNormalizedISBN( undef, $record, $marcflavour ); + + unless ( defined $this_item->{size} ) { + + #TT has problems with size + $this_item->{size} = q||; + } + + # Getting items infos for location display + my @items_infos = &GetItemsLocationInfo( $this_item->{'biblionumber'} ); + $this_item->{'ITEM_RESULTS'} = \@items_infos; + } + + # Build drop-down list for 'Add To:' menu... + my ( $totalref, $pubshelves, $barshelves ) = C4::VirtualShelves::GetSomeShelfNames( $loggedinuser, 'COMBO', 1 ); + $template->param( + addbarshelves => $totalref->{bartotal}, + addbarshelvesloop => $barshelves, + addpubshelves => $totalref->{pubtotal}, + addpubshelvesloop => $pubshelves, + can_manage_shelf => $shelf->can_be_managed($loggedinuser), + can_remove_shelf => $shelf->can_be_deleted($loggedinuser), + can_remove_biblios => $shelf->can_biblios_be_removed($loggedinuser), + can_add_biblios => $shelf->can_biblios_be_added($loggedinuser), + sortfield => $sortfield, + itemsloop => $items, + sortfield => $sortfield, + direction => $direction, + ); + if ($shelflimit) { + $template->param( + pagination_bar => pagination_bar( + q||, ( int( $totitems / $shelflimit ) ) + ( ( $totitems % $shelflimit ) > 0 ? 1 : 0 ), + $itemoff, "itemoff", { op => 'view', shelfnumber => $shelf->shelfnumber, sortfield => $sortfield, direction => $direction, } + ), + ); + } + } else { + push @messages, { type => 'error', code => 'unauthorized_on_view' }; + } + } else { + push @messages, { type => 'error', code => 'does_not_exist' }; + } +} + +$template->param( + op => $op, + referer => $referer, + shelf => $shelf, + messages => \@messages, + category => $category, + print => $query->param('print') || 0, + csv_profiles => GetCsvProfilesLoop('marc'), +); + +output_html_with_http_headers $query, $cookie, $template->output; -- 2.39.5