Fix for bug 1773, reading record not showing properly in the OPAC

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

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
index 89fa935..a085e7a 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
@@ -20,19 +20,23 @@ You have never borrowed anything from this library.
 
 <!-- TMPL_IF NAME="showfulllink" -->
 <!-- TMPL_IF NAME="limit" -->
-<li class="tabs-selected"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing All Items</a></li><li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=">Show Last 50 Items Only</a></li>
-<!-- TMPL_ELSE -->
 <li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=full">Show All Items</a></li><li class="tabs-selected"><a href="#readingrec">Showing Last 50 Items</a></li>
+<!-- TMPL_ELSE -->
+<li class="tabs-selected"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing All Items</a></li><li><a href="/cgi-bin/koha/opac-readingrecord.pl?limit=50">Show Last 50 Items Only</a></li>
 <!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
 <li class="tabs-selected"><a href="/cgi-bin/koha/opac-readingrecord.pl#readingrec">Showing All Items</a></li>
 <!-- /TMPL_IF -->
 </ul>
 <div class="tabs-container"><table id="readingrec">
-<tr><th><!-- TMPL_UNLESS NAME="orderbytitle" --><a href="/cgi-bin/koha/opac-readingrecord.pl?order=title">Title</a><!-- TMPL_ELSE -->&nbsp;
-        <!-- /TMPL_UNLESS --></th>
-<th><!-- TMPL_UNLESS --><a href="/cgi-bin/koha/opac-readingrecord.pl?order=author">Author</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_UNLESS --></th>
-<th><!-- TMPL_UNLESS NAME="orderbydate" --><a href="/cgi-bin/koha/opac-readingrecord.pl">Date</a><!-- TMPL_ELSE -->Date<!-- /TMPL_UNLESS --></th></tr>
+<tr><th><!-- TMPL_UNLESS NAME="orderbytitle" --><a
+href="/cgi-bin/koha/opac-readingrecord.pl?order=title">Title</a><!--
+TMPL_ELSE -->Title<!-- /TMPL_UNLESS --></th>
+<th><!-- TMPL_UNLESS NAME="orderbyauthor" --><a
+href="/cgi-bin/koha/opac-readingrecord.pl?order=author">Author</a><!--
+TMPL_ELSE -->Author<!-- /TMPL_UNLESS --></th>
+<th><!-- TMPL_UNLESS NAME="orderbydate" --><a href="/cgi-bin/koha/opac-readingrecord.pl">Date</a><!-- TMPL_ELSE -->Date<!-- /TMPL_UNLESS --></th>
+</tr>
 
 <!-- TMPL_LOOP NAME="READING_RECORD" -->
 

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 843384a..a52170e 100755 (executable)
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -68,6 +68,7 @@ if ( $limit eq 'full' ) {
 else {
     $limit = 50;
 }
+
 my ( $count, $issues ) = GetAllIssues( $borrowernumber, $order2, $limit );
 
 # add the row parity
@@ -100,7 +101,7 @@ $template->param(
     count          => $count,
     READING_RECORD => \@loop_reading,
     limit          => $limit,
-    showfulllink   => ( $count > 50 ),
+    showfulllink   => 1,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;