Bug 17089: Koha::Ratings - Remove DelRating

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/C4/Ratings.pm b/C4/Ratings.pm
index 0ec6e03..061d42b 100644 (file)
--- a/C4/Ratings.pm
+++ b/C4/Ratings.pm
@@ -35,7 +35,6 @@ BEGIN {
 
     @EXPORT = qw(
       &GetRating
-      &DelRating
     );
 }
 
@@ -57,9 +56,6 @@ Get a rating for a bib
  my $rating_hashref = GetRating( $biblionumber, undef );
  my $rating_hashref = GetRating( $biblionumber, $borrowernumber );
 
-Delete a rating for a bib
- my $rating_hashref = DelRating( $biblionumber, $borrowernumber );
-
 
 All subroutines in Ratings.pm return a hashref which contain 4 keys
 
@@ -184,28 +180,5 @@ sub GetRating {
     return \%rating_hash;
 }
 
-=head2 DelRating
-
-    my $rating_hashref = DelRating( $biblionumber, $borrowernumber );
-
-Delete a rating for a bib
-
-=cut
-
-sub DelRating {
-    my ( $biblionumber, $borrowernumber ) = @_;
-
-    my $rating = Koha::Database->new()->schema->resultset('Rating')->find(
-        {
-            borrowernumber => $borrowernumber,
-            biblionumber   => $biblionumber
-        }
-    );
-
-    $rating->delete() if $rating;
-
-    return GetRating($biblionumber);
-}
-
 1;
 __END__

diff --git a/opac/opac-ratings-ajax.pl b/opac/opac-ratings-ajax.pl
index 63e2ebc..a99a335 100755 (executable)
--- a/opac/opac-ratings-ajax.pl
+++ b/opac/opac-ratings-ajax.pl
@@ -73,8 +73,8 @@ my $rating;
 $rating_value //= '';
 
 if ( $rating_value eq '' ) {
-#### delete
-    $rating = DelRating( $biblionumber, $loggedinuser );
+    Koha::Ratings->find( { biblionumber => $biblionumber, borrowernumber => $loggedinuser } )->delete;
+    $rating = Koha::Ratings->search({ biblionumber => $biblionumber })->get_rating;
 }
 
 elsif ( $rating_value and !$rating_old_value ) {