Bug 13757: (QA followup) Exclude empty attributes from rendering if non-editable

[koha.git] / Koha / Virtualshelves.pm

diff --git a/Koha/Virtualshelves.pm b/Koha/Virtualshelves.pm
index 34b1003..a8d1b20 100644 (file)
--- a/Koha/Virtualshelves.pm
+++ b/Koha/Virtualshelves.pm
@@ -114,12 +114,51 @@ sub get_some_shelves {
         {
             join => [ 'virtualshelfshares' ],
             group_by => 'shelfnumber',
-            order_by => 'lastmodified desc',
+            order_by => { -desc => 'lastmodified' },
         }
     );
 }
 
-sub type {
+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,
+                            "me.allow_add"                      => 1,
+                        },
+                    }
+                },
+                { category => 2 },
+            ]
+          };
+    } else {
+        push @conditions, { category => 2 };
+    }
+
+    return Koha::Virtualshelves->search(
+        {
+            -and => \@conditions
+        },
+        {
+            join     => [ 'virtualshelfcontents', 'virtualshelfshares' ],
+            group_by => 'shelfnumber',
+            order_by => { -asc => 'shelfname' },
+        }
+    );
+}
+
+sub _type {
     return 'Virtualshelve';
 }