From a8e29a3e1b96897ecacef8c0996da31db330f120 Mon Sep 17 00:00:00 2001 From: Michael Imstepf Date: Wed, 12 Mar 2014 15:10:56 +1100 Subject: [PATCH 1/2] Don't limit the number of available starts by the number of previously selected stars --- lib/letsrate/helpers.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/letsrate/helpers.rb b/lib/letsrate/helpers.rb index c2130a0..762ea20 100644 --- a/lib/letsrate/helpers.rb +++ b/lib/letsrate/helpers.rb @@ -22,7 +22,8 @@ def rating_for_user(rateable_obj, rating_user, dimension = nil, options = {}) @object = rateable_obj @user = rating_user @rating = Rate.find_by_rater_id_and_rateable_id_and_dimension(@user.id, @object.id, dimension) - stars = @rating ? @rating.stars : 0 + available_stars = @rating ? @rating.stars : 0 + selected_star = options[:star] || 5 disable_after_rate = options[:disable_after_rate] || false @@ -31,11 +32,11 @@ def rating_for_user(rateable_obj, rating_user, dimension = nil, options = {}) readonly = current_user.present? ? !rateable_obj.can_rate?(current_user.id, dimension) : true end - content_tag :div, '', "data-dimension" => dimension, :class => "star", "data-rating" => stars, + content_tag :div, '', "data-dimension" => dimension, :class => "star", "data-rating" => available_stars, "data-id" => rateable_obj.id, "data-classname" => rateable_obj.class.name, "data-disable-after-rate" => disable_after_rate, "data-readonly" => readonly, - "data-star-count" => stars + "data-star-count" => selected_star end end From 66e85748c75a940dc1a7cd644a4ea06ad86c2334 Mon Sep 17 00:00:00 2001 From: Michael Imstepf Date: Wed, 12 Mar 2014 15:57:09 +1100 Subject: [PATCH 2/2] Don't limit the number of available starts by the number of previously selected stars --- lib/letsrate/helpers.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/letsrate/helpers.rb b/lib/letsrate/helpers.rb index 762ea20..07e9004 100644 --- a/lib/letsrate/helpers.rb +++ b/lib/letsrate/helpers.rb @@ -22,8 +22,8 @@ def rating_for_user(rateable_obj, rating_user, dimension = nil, options = {}) @object = rateable_obj @user = rating_user @rating = Rate.find_by_rater_id_and_rateable_id_and_dimension(@user.id, @object.id, dimension) - available_stars = @rating ? @rating.stars : 0 - selected_star = options[:star] || 5 + selected_star = @rating ? @rating.stars : 0 + available_stars = options[:star] || 5 disable_after_rate = options[:disable_after_rate] || false @@ -32,11 +32,11 @@ def rating_for_user(rateable_obj, rating_user, dimension = nil, options = {}) readonly = current_user.present? ? !rateable_obj.can_rate?(current_user.id, dimension) : true end - content_tag :div, '', "data-dimension" => dimension, :class => "star", "data-rating" => available_stars, + content_tag :div, '', "data-dimension" => dimension, :class => "star", "data-rating" => selected_star, "data-id" => rateable_obj.id, "data-classname" => rateable_obj.class.name, "data-disable-after-rate" => disable_after_rate, "data-readonly" => readonly, - "data-star-count" => selected_star + "data-star-count" => available_stars end end