Follow-up fix for Bug 5897 - Hide name of comment writer in OPAC

Correcting 'recent comments' view to obey ShowReviewer pref

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
index 92a8dd3..740f394 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -669,12 +669,12 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
             </h5>
             <small>[% review.datereviewed %]</small>
         <p>
-          [% review.review |0 %]
+          [% review.review %]
           <a href="#" onclick="Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=[% review.biblionumber %]&amp;reviewid=[% review.reviewid %]');">Edit</a>
         </p></div>
             [% ELSE %]
             <div class="commentline">
-            [% IF ( review.ShowReviewer ) %]
+            [% IF ( ShowReviewer ) %]
             <h5>
                 Comment by
                 [% review.title %]
@@ -684,7 +684,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
             [% END %]
             <small>[% review.datereviewed %]</small>
         <p>
-          [% review.review |0 %]
+          [% review.review %]
         </p></div>
             [% END %]
         [% END %]

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
index b16b219..e64fcae 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt
@@ -22,9 +22,9 @@ $(document).ready(function(){
     [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
         <td>
 
-<p>[% IF ( review.BiblioDefaultViewmarc ) %]<a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% review.biblionumber |url %]" title="View details for this title">
+<p>[% IF ( BiblioDefaultViewmarc ) %]<a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% review.biblionumber |url %]" title="View details for this title">
     [% ELSE %]
-    [% IF ( review.BiblioDefaultViewisbd ) %]<a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% review.biblionumber |url %]" title="View details for this title">
+    [% IF ( BiblioDefaultViewisbd ) %]<a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% review.biblionumber |url %]" title="View details for this title">
     [% ELSE %]<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber |url %]#comments" title="View details for this title">
     [% END %]
     [% END %]
@@ -47,7 +47,9 @@ $(document).ready(function(){
     [% IF ( review.copyrightdate ) %]<span class="results_summary"><span class="label">Date:</span>[% review.copyrightdate %]</span>[% END %]</p>
 
             <p class="commentline[% IF ( review.your_comment ) %] yours[% END %]">[% review.review |html %]
-            <span style="font-size:87%;font-color:#CCC;">Added [% review.datereviewed %] by [% IF ( review.your_comment ) %]<strong>you</strong>[% ELSE %][% review.firstname %] [% review.surname %][% END %]</span></p>
+            <span style="font-size:87%;font-color:#CCC;">Added [% review.datereviewed %] [% IF ( review.your_comment ) %] by <strong>you</strong>[% ELSE %]
+            [% IF ( ShowReviewer ) %] by
+            [% review.firstname %] [% review.surname %][% END %][% END %]</span></p>
         </td>
         <td>
             <a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]">