Download as
Browse Code »

Commit bd32f803f429d7e9ea89d8f002039f3d32409bf6

Authored by Tallys Martins
1 parent e3b23cb0
Exists in suggest_rejected_value

Display rejected rating comments only to env admins 

Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
Showing 4 changed files with 18 additions and 4 deletions   Show diff stats
plugins/organization_ratings/db/migrate/20151117232133_add_display_comment_to_organization_rating.rb 0 → 100644
  Diff comments   View file @bd32f80
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +class AddDisplayCommentToOrganizationRating < ActiveRecord::Migration
  2 + def change
  3 + add_column :organization_ratings, :comment_rejected, :boolean, :default => false
  4 + end
  5 +end
plugins/organization_ratings/lib/create_organization_rating_comment.rb
  Diff comments   View file @bd32f80
@@ -9,19 +9,24 @@ class CreateOrganizationRatingComment &lt; Task @@ -9,19 +9,24 @@ class CreateOrganizationRatingComment &lt; Task
9 attr_accessible :organization_rating_id, :body, :requestor 9 attr_accessible :organization_rating_id, :body, :requestor
10 attr_accessible :reject_explanation, :target 10 attr_accessible :reject_explanation, :target
11 11
12 - before_save :update_comment_body 12 + before_save :update_comment_body, :check_display_comment
13 13
14 DATA_FIELDS = ['body'] 14 DATA_FIELDS = ['body']
15 DATA_FIELDS.each do |field| 15 DATA_FIELDS.each do |field|
16 settings_items field.to_sym 16 settings_items field.to_sym
17 end 17 end
18 18
  19 + def check_display_comment
  20 + @rating = OrganizationRating.find_by_id(self.organization_rating_id)
  21 + @rating.comment_rejected = true if self.status == Status::CANCELLED
  22 + end
  23 +
19 def update_comment_body 24 def update_comment_body
20 if self.organization_rating_comment_id.nil? 25 if self.organization_rating_comment_id.nil?
21 create_comment 26 create_comment
22 else 27 else
23 comment = Comment.find_by_id(self.organization_rating_comment_id) 28 comment = Comment.find_by_id(self.organization_rating_comment_id)
24 - comment.body = get_comment_message 29 + comment.body = self.body
25 comment.save 30 comment.save
26 end 31 end
27 end 32 end
plugins/organization_ratings/lib/organization_rating.rb
  Diff comments   View file @bd32f80
@@ -3,7 +3,7 @@ class OrganizationRating &lt; ActiveRecord::Base @@ -3,7 +3,7 @@ class OrganizationRating &lt; ActiveRecord::Base
3 belongs_to :organization 3 belongs_to :organization
4 belongs_to :comment 4 belongs_to :comment
5 5
6 - attr_accessible :value, :person, :organization, :comment 6 + attr_accessible :value, :person, :organization, :comment, :comment_rejected
7 7
8 validates :value, 8 validates :value,
9 :presence => true, :inclusion => { 9 :presence => true, :inclusion => {
@@ -13,6 +13,9 @@ class OrganizationRating &lt; ActiveRecord::Base @@ -13,6 +13,9 @@ class OrganizationRating &lt; ActiveRecord::Base
13 validates :organization_id, :person_id, 13 validates :organization_id, :person_id,
14 :presence => true 14 :presence => true
15 15
  16 + def comment_rejected?
  17 + return comment_rejected
  18 + end
16 19
17 def self.average_rating organization_id 20 def self.average_rating organization_id
18 average = OrganizationRating.where(organization_id: organization_id).average(:value) 21 average = OrganizationRating.where(organization_id: organization_id).average(:value)
plugins/organization_ratings/views/shared/_user_rating_container.html.erb
  Diff comments   View file @bd32f80
@@ -25,7 +25,8 @@ @@ -25,7 +25,8 @@
25 </div> 25 </div>
26 26
27 <div class="user-testimony"> 27 <div class="user-testimony">
28 - <%= user_rate.comment.nil? ? _("No comment") : user_rate.comment.body %> 28 +
  29 + <%= user_rate.comment.nil? ? _("No comment") : (user_rate.comment_rejected? ? "" : user_rate.comment.body) %>
29 </div> 30 </div>
30 31
31 <%= @plugins.dispatch(:organization_ratings_plugin_extra_fields_show_data, user_rate).collect { |content| instance_exec(&content) }.join("") %> 32 <%= @plugins.dispatch(:organization_ratings_plugin_extra_fields_show_data, user_rate).collect { |content| instance_exec(&content) }.join("") %>