Bug 24545: Fix license statements

[srvgit] / Koha / Virtualshelves.pm

diff --git a/Koha/Virtualshelves.pm b/Koha/Virtualshelves.pm
index 34b1003..3dde3c3 100644 (file)
--- a/Koha/Virtualshelves.pm
+++ b/Koha/Virtualshelves.pm
@@ -2,18 +2,18 @@ package Koha::Virtualshelves;
 
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
 
@@ -55,7 +55,7 @@ sub get_private_shelves {
         },
         {
             join => [ 'virtualshelfshares' ],
-            group_by => 'shelfnumber',
+            distinct => 'shelfnumber',
             order_by => 'shelfname',
             ( ( $page and $rows ) ? ( page => $page, rows => $rows ) : () ),
         }
@@ -73,7 +73,7 @@ sub get_public_shelves {
             category => 2,
         },
         {
-            group_by => 'shelfnumber',
+            distinct => 'shelfnumber',
             order_by => 'shelfname',
             ( ( $page and $rows ) ? ( page => $page, rows => $rows ) : () ),
         }
@@ -90,10 +90,13 @@ sub get_some_shelves {
     if ( $add_allowed ) {
         push @conditions, {
             -or =>
-            {
-                "me.allow_add" => 1,
-                "me.owner" => $borrowernumber,
-            }
+            [
+                {
+                    "me.owner" => $borrowernumber,
+                    "me.allow_change_from_owner" => 1,
+                },
+                "me.allow_change_from_others" => 1,
+            ]
         };
     }
     if ( $category == 1 ) {
@@ -113,13 +116,51 @@ sub get_some_shelves {
         },
         {
             join => [ 'virtualshelfshares' ],
-            group_by => 'shelfnumber',
-            order_by => 'lastmodified desc',
+            distinct => 'shelfnumber',
+            order_by => { -desc => 'lastmodified' },
+        }
+    );
+}
+
+sub get_shelves_containing_record {
+    my ( $self, $params ) = @_;
+    my $borrowernumber = $params->{borrowernumber};
+    my $biblionumber   = $params->{biblionumber};
+
+    my @conditions = ( 'virtualshelfcontents.biblionumber' => $biblionumber );
+    if ($borrowernumber) {
+        push @conditions,
+          {
+              -or => [
+                {
+                    category => 1,
+                    -or      => {
+                        'me.owner' => $borrowernumber,
+                        -or        => {
+                            'virtualshelfshares.borrowernumber' => $borrowernumber,
+                        },
+                    }
+                },
+                { category => 2 },
+            ]
+          };
+    } else {
+        push @conditions, { category => 2 };
+    }
+
+    return Koha::Virtualshelves->search(
+        {
+            -and => \@conditions
+        },
+        {
+            join     => [ 'virtualshelfcontents', 'virtualshelfshares' ],
+            distinct => 'shelfnumber',
+            order_by => { -asc => 'shelfname' },
         }
     );
 }
 
-sub type {
+sub _type {
     return 'Virtualshelve';
 }