@@ -, +, @@ --- C4/Review.pm | 21 +----- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 12 ++-- .../opac-tmpl/bootstrap/en/modules/opac-review.tt | 37 +---------- opac/opac-ISBDdetail.pl | 14 +--- opac/opac-detail.pl | 67 +++++++++++--------- 5 files changed, 49 insertions(+), 102 deletions(-) --- a/C4/Review.pm +++ a/C4/Review.pm @@ -28,7 +28,7 @@ BEGIN { require Exporter; @ISA = qw(Exporter); @EXPORT = qw(getreview savereview updatereview numberofreviews numberofreviewsbybiblionumber - getreviews getallreviews approvereview unapprovereview deletereview); + getallreviews approvereview unapprovereview deletereview); } =head1 NAME @@ -44,7 +44,6 @@ C4::Review - Perl Module containing routines for dealing with reviews of items updatereview($biblionumber,$borrowernumber,$review); my $count=numberofreviews($status); my $count=numberofreviewsbybiblionumber($biblionumber); - my $reviews=getreviews($biblionumber, $status); my $reviews=getallreviews($status, [$offset], [$row_count]); =head1 DESCRIPTION @@ -140,24 +139,6 @@ sub numberofreviewsbybiblionumber { return $sth->fetchrow; } -=head2 getreviews - - my $reviews=getreviews($biblionumber, $status); - -Return all reviews where in the 'reviews' database : -'biblionumber' = $biblionumber and 'approved' = $status - -=cut - -sub getreviews { - my ( $biblionumber, $approved ) = @_; - my $dbh = C4::Context->dbh; - my $query = "SELECT * FROM reviews WHERE biblionumber=? and approved=? order by datereviewed desc"; - my $sth = $dbh->prepare($query); - $sth->execute( $biblionumber, $approved ); - return $sth->fetchall_arrayref( {} ); -} - =head2 getallreviews my $reviews=getallreviews($status, [$offset], [$row_count]); --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -881,12 +881,16 @@
[% IF ( reviews ) %] [% FOREACH review IN reviews %] - [% IF ( review.your_comment ) %] + [% IF review.borrowernumber == borrowernumber %]
[% IF ( review.avatarurl ) %] [% END %] -
Your comment
+ [% IF review.approved %] +
Your comment
+ [% ELSE %] +
Your comment (preview, pending approval)
+ [% END %] [% review.datereviewed | $KohaDates %]

[% FILTER html_break %] @@ -923,7 +927,7 @@ [% END %]

- [% END # / IF review.your_comment %] + [% END %] [% END # / FOREACH reviews %] [% ELSE %]

There are no comments for this item.

@@ -932,7 +936,7 @@ [% IF ( loggedinusername ) %] [% UNLESS ( loggedincommenter ) %]
- Post or edit your comments on this item. + Post your comments on this item.
[% END %] [% ELSE %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt @@ -61,41 +61,8 @@