Shelves - bugfix, toggle "Holds" link, add "Author" column to intranet

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/VirtualShelves.pm b/C4/VirtualShelves.pm
index 8312bc6..30fcbe8 100644 (file)
--- a/C4/VirtualShelves.pm
+++ b/C4/VirtualShelves.pm
@@ -356,8 +356,9 @@ sub ShelfPossibleAction {
     my $sth = $dbh->prepare($query);
     $sth->execute($shelfnumber);
     my ( $owner, $category ) = $sth->fetchrow;
-    return 1 if (($category >= 3 or $owner eq $user) && $action eq 'manage' );
-    return 1 if (($category >= 2 or $owner eq $user) && $action eq 'view' );
+    return 1 if ($owner eq $user);
+    return 1 if ( $category >= 3);
+    return 1 if (($category >= 2) && $action eq 'view' );
     return 0;
 }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index 2415a7c..b8f8046 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -85,48 +85,46 @@ function confirmDelete(s,n){
 <legend>Contents of <i><!-- TMPL_VAR NAME="shelfname" --></i></legend>
     <table>
             <tr>
-                <th class="checkall">
-                   &nbsp;
-                </th>
-                <th>&nbsp;</th>
+                <th class="checkall">&nbsp;</th>
+                <th>Type</th>
                 <th>Title</th>
+                <th>Author</th>
                 <th>Call No.</th>
                 <th>&nbsp;</th>
             </tr>
-        <!-- TMPL_LOOP NAME="itemsloop" -->
-            <!-- TMPL_IF name="color" -->
-            <tr class="highlight">
-            <!-- TMPL_ELSE -->
-            <tr>
-            <!-- /TMPL_IF -->
-                    <td>
-                        <input type="checkbox" name="REM-<!-- TMPL_VAR NAME="biblionumber" -->" />
-                    </td>
-                    <td>
-                        <img src="<!-- TMPL_VAR NAME="themelang" -->/../img/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
-                    </td>
-                    <td> <p>
-                <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
-                            <a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                                <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
-                            </a>
-                        <!-- TMPL_ELSE -->
-                            <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
-                                <a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                                    <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
-                                </a>
-                            <!-- TMPL_ELSE -->
-                                <a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                                    <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
-                                </a>
-                            <!-- /TMPL_IF -->
-                        <!-- /TMPL_IF -->
-                    </p>
-                    <p><!-- TMPL_VAR NAME="author" --></p></td>
-                    <td><!-- TMPL_VAR NAME="classification" --></td>
-                    <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a></td>
-        </tr>
-        <!-- /TMPL_LOOP --><!-- /itemsloop -->
+               <!-- TMPL_LOOP NAME="itemsloop" -->
+                       <!-- TMPL_IF name="color" -->
+                       <tr class="highlight">
+                       <!-- TMPL_ELSE -->
+                       <tr>
+                       <!-- /TMPL_IF -->
+                       <td>
+                               <input type="checkbox" name="REM-<!-- TMPL_VAR NAME="biblionumber" -->" />
+                       </td>
+                       <td>
+                               <img src="<!-- TMPL_VAR NAME="themelang" -->/../img/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
+                       </td>
+                       <td>
+                       <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+                               <a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                       <!-- TMPL_ELSE -->
+                               <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
+                               <a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                               <!-- TMPL_ELSE -->
+                               <a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                               <!-- /TMPL_IF -->
+                       <!-- /TMPL_IF -->
+                       <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a>
+                       </td>
+                       <td><!-- TMPL_VAR NAME="author" --></td>
+                       <td><!-- TMPL_VAR NAME="classification" --></td>
+                       <td>
+                       <!-- TMPL_UNLESS name="notforloan" -->
+                       <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a>
+                       <!-- /TMPL_UNLESS -->
+                       </td>
+                       </tr>
+               <!-- /TMPL_LOOP --><!-- /itemsloop -->
     </table>
             </fieldset>
         <fieldset class="action">

diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl
index a118e43..abef815 100755 (executable)
--- a/opac/opac-shelves.pl
+++ b/opac/opac-shelves.pl
@@ -156,11 +156,13 @@ SWITCH: {
                        foreach (grep {$i++ % 2} @$items) {             # every other item
                                $_->{toggle} = 1;
                        }
+                       my $manageshelf = &ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' );
+                       ($manageshelf) and $showadd = 1;
             $template->param(
                 shelfname   => $shelflist->{$shelfnumber}->{'shelfname'},
                 shelfnumber => $shelfnumber,
                 viewshelf   => $query->param('viewshelf'),
-                manageshelf => &ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' ),
+                manageshelf => $manageshelf,
                 itemsloop   => $items,
             );
         } # else {;}  # FIXME - some kind of warning *may* be in order
@@ -227,11 +229,11 @@ foreach my $element (sort { lc($shelflist->{$a}->{'shelfname'}) cmp lc($shelflis
                $line{'firstname'} = $shelflist->{$element}->{'firstname'};
                $line{ 'surname' } = $shelflist->{$element}->{ 'surname' };
        }
-       if ($shelflist->{$element}->{'category'} eq 2) {
-               push (@shelvesloop,     \%line);
-       } elsif ($shelflist->{$element}->{'category'} eq 1) {
+       if ($shelflist->{$element}->{'category'} eq '1') {
         push (@shelveslooppriv, \%line);
-    }
+    } else {
+               push (@shelvesloop,     \%line);
+       }
 }
 
 $template->param(