Added improvements on hotspots interfaces

- Added one hotspot for task contents and another for ratings container content - Rejected comments now are only displayed to env admins Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>

Added improvements on hotspots interfaces
- Added one hotspot for task contents and another for ratings container content - Rejected comments now are only displayed to env admins Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
Tallys Martins
1 parent ef0db549
Showing 7 changed files with 30 additions and 9 deletions Show diff stats
plugins/organization_ratings/lib/create_organization_rating_comment.rb
plugins/organization_ratings/lib/organization_rating.rb
plugins/organization_ratings/lib/organization_ratings_plugin.rb
plugins/organization_ratings/test/test_helper.rb
plugins/organization_ratings/test/unit/organization_rating_test.rb
plugins/organization_ratings/views/shared/_user_rating_container.html.erb
plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb
@@ -19,6 +19,7 @@ class CreateOrganizationRatingComment &lt; Task
   def check_display_comment
     @rating = OrganizationRating.find_by_id(self.organization_rating_id)
     @rating.comment_rejected = true if self.status == Status::CANCELLED
+    @rating.save
   end
   def update_comment_body
@@ -14,7 +14,15 @@ class OrganizationRating &lt; ActiveRecord::Base
             :presence => true
   def comment_rejected?
-    return comment_rejected
+    comment_rejected
+  end
+
+  def display_comment_to? person
+    if person.present?
+      person.is_admin? || !comment_rejected?
+    else
+      !comment_rejected?
+    end
   end
   def self.average_rating organization_id
@@ -22,7 +22,11 @@ class OrganizationRatingsPlugin &lt; Noosfero::Plugin
       nil
     end
-    def organization_ratings_plugin_extra_fields_show_data user_rating
+    def organization_ratings_plugin_task_extra_fields user_rating
+      nil
+    end
+
+    def organization_ratings_plugin_container_extra_fields user_rating
       nil
     end
@@ -0,0 +1,4 @@
+class TestOrganizationRating
+
+
+end
@@ -21,6 +21,11 @@ class OrganizationRatingTest &lt; ActiveSupport::TestCase
     assert_equal false, organization_rating2.errors[:value].include?("must be between 1 and 5")
   end
+  test "display rating comment to env admin" do
+    p = fast_create(OrganizationRating)
+
+  end
+
   test "Create task for create a rating comment" do
     person = create_user('molly').person
     person.email = "person@email.com"
@@ -25,10 +25,10 @@
     </div>
     <div class="user-testimony">
-
-      <%= user_rate.comment.nil? ? _("No comment") : (user_rate.comment_rejected? ? "" : user_rate.comment.body) %>
+      <p class="no-comment"> <%= _("No comment") if  user_rate.comment.nil? %> <p>
+      <p class="comment-rejected-msg"> <%= _("Comment rejected") if user_rate.comment_rejected? %> </p>
+      <p class="comment-body"> <%= user_rate.comment.body if user_rate.display_comment_to?(user) %> </p>
     </div>
-
-    <%= @plugins.dispatch(:organization_ratings_plugin_extra_fields_show_data, user_rate).collect { |content| instance_exec(&content) }.join("") %>
+    <%= @plugins.dispatch(:organization_ratings_plugin_container_extra_fields, user_rate).collect { |content| instance_exec(&content) }.join("") %>
   </div>
 </div>
 <div class="organization-rating-comment-body">
+  <% rating = OrganizationRating.find(task.organization_rating_id) %>
+  <%= @plugins.dispatch(:organization_ratings_plugin_task_extra_fields, rating).collect{ |content| instance_exec(&content) }.join("") %>
   <div class="task-comment">
     <%= _("Comment:")%>
     <%= "\"#{task.body}\""%>\
   </div>
-  <% rating = OrganizationRating.find(task.organization_rating_id) %>
-  <%= @plugins.dispatch(:organization_ratings_plugin_extra_fields_show_data, rating).collect{ |content| instance_exec(&content) }.join("") %>
-
   <span class="rating-notice"><%="* "+_("The rating score is not moderated")%></span>
   <div class="task-star-container">
     <% (1..5).each do |star_number| %>
	@@ -19,6 +19,7 @@ class CreateOrganizationRatingComment < Task		@@ -19,6 +19,7 @@ class CreateOrganizationRatingComment < Task
19	def check_display_comment	19	def check_display_comment
20	@rating = OrganizationRating.find_by_id(self.organization_rating_id)	20	@rating = OrganizationRating.find_by_id(self.organization_rating_id)
21	@rating.comment_rejected = true if self.status == Status::CANCELLED	21	@rating.comment_rejected = true if self.status == Status::CANCELLED
		22	+ @rating.save
22	end	23	end
23		24
24	def update_comment_body	25	def update_comment_body
	@@ -14,7 +14,15 @@ class OrganizationRating < ActiveRecord::Base		@@ -14,7 +14,15 @@ class OrganizationRating < ActiveRecord::Base
14	:presence => true	14	:presence => true
15		15
16	def comment_rejected?	16	def comment_rejected?
17	- return comment_rejected	17	+ comment_rejected
		18	+ end
		19	+
		20	+ def display_comment_to? person
		21	+ if person.present?
		22	+ person.is_admin? \|\| !comment_rejected?
		23	+ else
		24	+ !comment_rejected?
		25	+ end
18	end	26	end
19		27
20	def self.average_rating organization_id	28	def self.average_rating organization_id
@@ -0,0 +1,4 @@		@@ -0,0 +1,4 @@
	1	+class TestOrganizationRating
	2	+
	3	+
	4	+end