ffzg/recall_notices.pl: added --interval and --dedup

[koha.git] / opac / opac-addbybiblionumber.pl

diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index 9227fa0..ddc6778 100755 (executable)
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -25,6 +25,7 @@ use C4::Biblio;
 use C4::Output;
 use C4::Auth;
 
+use Koha::Biblios;
 use Koha::Virtualshelves;
 
 my $query           = new CGI;
@@ -107,25 +108,26 @@ if ($newvirtualshelf) {
         my $private_shelves = Koha::Virtualshelves->search(
             {   category => 1,
                 owner    => $loggedinuser,
+                allow_change_from_owner => 1,
             },
             { order_by => 'shelfname' }
         );
         my $shelves_shared_with_me = Koha::Virtualshelves->search(
             {   category                            => 1,
                 'virtualshelfshares.borrowernumber' => $loggedinuser,
-                -or                                 => {
-                    allow_add => 1,
-                    owner     => $loggedinuser,
-                }
+                allow_change_from_others            => 1,
             },
             { join => 'virtualshelfshares', }
         );
         my $public_shelves = Koha::Virtualshelves->search(
             {   category => 2,
-                -or      => {
-                    allow_add => 1,
-                    owner     => $loggedinuser,
-                }
+                -or      => [
+                    -and => {
+                        allow_change_from_owner => 1,
+                        owner     => $loggedinuser,
+                    },
+                    allow_change_from_others => 1,
+                ],
             },
             { order_by => 'shelfname' }
         );
@@ -141,12 +143,12 @@ if ($newvirtualshelf) {
 
 if ($authorized) {
     for my $biblionumber (@biblionumbers) {
-        my $data = GetBiblioData($biblionumber);
+        my $biblio = Koha::Biblios->find( $biblionumber );
         push(
             @biblios,
             {   biblionumber => $biblionumber,
-                title        => $data->{'title'},
-                author       => $data->{'author'},
+                title        => $biblio->title,
+                author       => $biblio->author,
             }
         );
     }