Merge branch 'master' into staging_rails4

Victor Costa
2 parents 0bf25818 0c7ed580
Showing 13 changed files with 293 additions and 172 deletions Show diff stats
app/views/tasks/_task.html.erb
plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb
plugins/organization_ratings/db/migrate/20151203121430_destroy_rejected_reports.rb
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/functional/organization_ratings_plugin_profile_controller_test.rb
plugins/organization_ratings/test/unit/create_organization_rating_comment_test.rb
plugins/organization_ratings/test/unit/organization_rating_test.rb
plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
plugins/organization_ratings/views/shared/_user_rating_container.html.erb
plugins/organization_ratings/views/tasks/_create_organization_rating_comment_accept_details.html.erb
public/stylesheets/tasks.scss
@@ -2,6 +2,10 @@
   <%= render :partial => 'task_icon', :locals => {:task => task} %>
+  <div class="task_date"><%= show_time(task.created_at) %></div>
+
+  <%= render :partial => 'task_title', :locals => {:task => task} %>
+
   <% if !@view_only && profile.organization? && @responsible_candidates.present? %>
     <div class="task_responsible">
       <span class="label"><%= _('Assign to:') %></span>
@@ -41,9 +45,6 @@
     <% end %>
   </div><!-- class="task_decisions" -->
-  <div class="task_date"><%= show_time(task.created_at) %></div>
-
-  <%= render :partial => 'task_title', :locals => {:task => task} %>
   <div class="task_information">
     <%= task_information(task) %>
@@ -54,23 +54,18 @@ class OrganizationRatingsPluginProfileController &lt; ProfileController
   end
   def create_rating_comment(rating)
-    if params[:comments]
-        comment_task = CreateOrganizationRatingComment.create!(
-          params[:comments].merge(
-            :requestor => rating.person,
-            :organization_rating_id => rating.id,
-            :target => rating.organization
-          )
+    if params[:comments].present? && params[:comments][:body].present?
+      comment_task = CreateOrganizationRatingComment.create!(
+        params[:comments].merge(
+          :requestor => rating.person,
+          :organization_rating_id => rating.id,
+          :target => rating.organization
         )
-        comment_task.finish if can_perform?(params)
+      )
+      comment_task.finish unless env_organization_ratings_config.are_moderated
     end
   end
-  def can_perform? (params)
-    (params[:comments][:body].blank? ||
-    !env_organization_ratings_config.are_moderated)
-  end
-
   def permission
     :manage_memberships
   end
@@ -0,0 +1,14 @@
+class DestroyRejectedReports < ActiveRecord::Migration
+  def up
+    comments = []
+    select_all("SELECT data FROM tasks WHERE type = 'CreateOrganizationRatingComment' AND status = 2").each do |task|
+      settings = YAML.load(task['data'])
+      comments << settings[:organization_rating_comment_id]
+    end
+    execute("DELETE FROM comments WHERE id IN (#{comments.join(',')})")
+  end
+
+  def down
+    say "This migration can't be reverted"
+  end
+end
@@ -9,28 +9,14 @@ class CreateOrganizationRatingComment &lt; Task
   attr_accessible :organization_rating_id, :body, :requestor
   attr_accessible :reject_explanation, :target
-  before_save :update_comment_body
-
   DATA_FIELDS = ['body']
   DATA_FIELDS.each do |field|
     settings_items field.to_sym
   end
-  def update_comment_body
-    if self.organization_rating_comment_id.nil?
-      create_comment
-    else
-      comment = Comment.find_by_id(self.organization_rating_comment_id)
-      comment.body = get_comment_message
-      comment.save
-    end
-  end
-
-  def create_comment
+  def perform
     if (self.body && !self.body.blank?)
-      comment_body = _("Comment waiting for approval")
-      comment = Comment.create!(:source => self.target, :body => comment_body, :author => self.requestor)
-
+      comment = Comment.create!(:source => self.target, :body => self.body, :author => self.requestor)
       self.organization_rating_comment_id = comment.id
       link_comment_with_its_rating(comment)
@@ -43,26 +29,16 @@ class CreateOrganizationRatingComment &lt; Task
     rating.save
   end
-  def get_comment_message
-    if self.status == Status::CANCELLED
-      _("Comment rejected")
-    elsif self.status == Status::FINISHED
-      self.body
-    else
-      _("No comment")
-    end
-  end
-
   def accept_details
     true
   end
   def title
-    _("New Comment")
+    _("New Report")
   end
   def information
-    message = _("<a href=%{requestor_url}>%{requestor}</a> wants to create a comment in this %{target_class}") %
+    message = _("<a href=%{requestor_url}>%{requestor}</a> wants to leave a report about this %{target_class}") %
     {:requestor_url => url_for(self.requestor.url), :requestor => self.requestor.name, :target_class => _(self.target.class.name)}
     {:message => message}
@@ -87,45 +63,48 @@ class CreateOrganizationRatingComment &lt; Task
   end
   def target_notification_description
-    _("%{requestor} wants to create a comment in this \"%{target}\"") %
+    _("%{requestor} wants to leave a report about this \"%{target}\"") %
     {:requestor => self.requestor.name, :target => _(self.target.class.name.downcase) }
   end
   def target_notification_message
-    _("User \"%{user}\" requested to create a comment in the %{target_class}
+    _("User \"%{user}\" just made a report at %{target_class}
       \"%{target_name}\".
       You have to approve or reject it through the \"Pending Validations\"
       section in your control panel.\n") %
-    { :user => self.requestor.name, :target_class => _(self.target.class.name.downcase), :target_name => self.target.name }
+    { :user => self.requestor.name,
+      :target_class => _(self.target.class.name.downcase),
+      :target_name => self.target.name }
   end
   def task_created_message
-    _("Your request for commenting at %{target} was
+    _("Your report at %{target_class} \"%{target}\" was
       just sent. The administrator will receive it and will approve or
       reject your request according to his methods and criteria.
       You will be notified as soon as environment administrator has a position
       about your request.") %
-    { :target => self.target.name }
+    { :target_class => _(self.target.class.name.downcase), :target => self.target.name }
   end
   def task_cancelled_message
-    _("Your request for commenting at %{target} was
+    _("Your report at %{target_class} \"%{target}\" was
       not approved by the administrator. The following explanation
       was given: \n\n%{explanation}") %
-    { :target => self.target.name,
+    { :target_class => _(self.target.class.name.downcase),
+      :target => self.target.name,
       :explanation => self.reject_explanation }
   end
   def task_finished_message
-    _('Your request for commenting at %{target} was approved.
-      You can access %{url} to see your comment.') %
-    { :target => self.target.name, :url => ratings_url }
+    _("Your report at %{target_class} \"%{target}\" was approved.
+      You can access %{url} to see your comment.") %
+    { :target_class => _(self.target.class.name.downcase), :target => self.target.name, :url => ratings_url }
   end
   private
   def ratings_url
-    url = url_for(self.target.public_profile_url) + "/plugin/organization_ratings/new_rating"
+    url_for(self.target.public_profile_url) + "/plugin/organization_ratings/new_rating"
   end
 end
@@ -13,6 +13,18 @@ class OrganizationRating &lt; ActiveRecord::Base
   validates :organization_id, :person_id,
             :presence => true
+  def display_moderation_message person
+    if person.present?
+      task_active? && (person.is_admin? || person == self.person ||
+      self.organization.is_admin?(person))
+    end
+  end
+
+  def task_active?
+    tasks = CreateOrganizationRatingComment.where(:target_id => self.organization.id,
+                                                  :status => Task::Status::ACTIVE)
+    tasks.detect {|t| t.organization_rating_id == self.id}.present?
+  end
   def self.average_rating organization_id
     average = OrganizationRating.where(organization_id: organization_id).average(:value)
@@ -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
@@ -17,6 +17,7 @@ class OrganizationRatingsPluginProfileControllerTest &lt; ActionController::TestCas
     @person = create_user('testuser').person
     @community = Community.create(:name => "TestCommunity")
+    @community.add_admin @person
     @enterprise = fast_create(Enterprise)
     @config = OrganizationRatingsConfig.instance
     login_as(@person.identifier)
@@ -36,13 +37,13 @@ class OrganizationRatingsPluginProfileControllerTest &lt; ActionController::TestCas
     assert_redirected_to @community.url
   end
-  test "Create community_rating without comment body" do
+  test "create community_rating without comment body" do
     post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => 2
     assert_equal "#{@community.name} successfully rated!", session[:notice]
   end
-  test "Do not create community_rating without a rate value" do
+  test "do not create community_rating without a rate value" do
     post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => nil
     assert_equal "Sorry, there were problems rating this profile.", session[:notice]
@@ -76,13 +77,13 @@ class OrganizationRatingsPluginProfileControllerTest &lt; ActionController::TestCas
     block = StatisticsBlock.new
     enterprise = fast_create(Enterprise)
     post :new_rating, profile: enterprise.identifier, :comments => {:body => "body board"}, :organization_rating_value => 1
+    CreateOrganizationRatingComment.last.finish
     enterprise.reload
     @environment.reload
     block.expects(:owner).at_least_once.returns(@environment)
     assert_equal 1, block.comments
   end
-
   test "should count organization ratings on statistic block when block owner = Profile" do
     @config.cooldown = 0
     @config.save
@@ -91,13 +92,15 @@ class OrganizationRatingsPluginProfileControllerTest &lt; ActionController::TestCas
     post :new_rating, profile: @community.identifier, :comments => {:body => "body board"}, :organization_rating_value => 1
     post :new_rating, profile: @community.identifier, :comments => {:body => "body surf"}, :organization_rating_value => 5
-
+    CreateOrganizationRatingComment.all.each do |s|
+      s.finish
+    end
     block.expects(:owner).at_least_once.returns(@community)
     @community.reload
     assert_equal 2, block.comments
   end
-  test "Display unavailable rating message for users that must wait the rating cooldown time" do
+  test "display unavailable rating message for users that must wait the rating cooldown time" do
     post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => 3
     assert_no_match(/The administrators set the minimum time of/, @response.body)
     valid_rating = OrganizationRating.last
@@ -108,4 +111,81 @@ class OrganizationRatingsPluginProfileControllerTest &lt; ActionController::TestCas
     assert_equal valid_rating.id, new_rating.id
   end
+
+  test "display moderation report message body to community admin" do
+    @member = create_user('member')
+    @community.add_member @member.person
+    login_as 'member'
+    @controller.stubs(:current_user).returns(@member)
+
+    post :new_rating, profile: @community.identifier, :comments => {:body => "comment"}, :organization_rating_value => 3
+
+    login_as 'testuser'
+    @controller.stubs(:current_user).returns(@person.user)
+    get :new_rating, profile: @community.identifier
+    assert_tag :tag => 'p', :content => /Report waiting for approval/, :attributes => {:class =>/moderation-msg/}
+    assert_no_tag :tag => 'p', :attributes => {:class =>/comment-body/}
+  end
+
+  test "display moderation report message to owner" do
+    @member = create_user('member')
+    @community.add_member @member.person
+    login_as 'member'
+    @controller.stubs(:current_user).returns(@member)
+
+    post :new_rating, profile: @community.identifier, :comments => {:body => "comment"}, :organization_rating_value => 3
+    get :new_rating, profile: @community.identifier
+    assert_tag :tag => 'p', :content => /Report waiting for approval/, :attributes => {:class =>/moderation-msg/}
+    assert_no_tag :tag => 'p', :attributes => {:class =>/comment-body/}
+  end
+
+  test "display moderation report message comment to env admin" do
+    post :new_rating, profile: @community.identifier, :comments => {:body => "comment"}, :organization_rating_value => 3
+
+    @admin = create_admin_user(@environment)
+    login_as @admin
+    @controller.stubs(:current_user).returns(Profile[@admin].user)
+
+    get :new_rating, profile: @community.identifier
+    assert_tag :tag => 'p', :content => /Report waiting for approval/, :attributes => {:class =>/moderation-msg/}
+    assert_no_tag :tag => 'p', :attributes => {:class =>/comment-body/}
+  end
+
+  test "not display moderation report message to regular user" do
+    post :new_rating, profile: @community.identifier, :comments => {:body => "comment"}, :organization_rating_value => 3
+    rating_task = CreateOrganizationRatingComment.last
+    rating_task.cancel
+
+    @member = create_user('member')
+    @community.add_member @member.person
+    login_as 'member'
+    @controller.stubs(:current_user).returns(@member)
+
+    get :new_rating, profile: @community.identifier
+    assert_no_tag :tag => 'p', :content => /Report waiting for approval/, :attributes => {:class =>/moderation-msg/}
+    assert_no_tag :tag => 'p', :attributes => {:class =>/comment-body/}
+  end
+
+  test "not display rejected comment message to not logged user" do
+    post :new_rating, profile: @community.identifier, :comments => {:body => "comment"}, :organization_rating_value => 3
+    rating_task = CreateOrganizationRatingComment.last
+    rating_task.cancel
+
+    logout
+    @controller.stubs(:logged_in?).returns(false)
+
+    get :new_rating, profile: @community.identifier
+    assert_no_tag :tag => 'p', :content => /Report waiting for approval/, :attributes => {:class =>/comment-rejected-msg/}
+    assert_no_tag :tag => 'p', :attributes => {:class =>/comment-body/}
+  end
+
+  test "display report when Task accepted" do
+    post :new_rating, profile: @community.identifier, :comments => {:body => "comment accepted"}, :organization_rating_value => 3
+    rating_task = CreateOrganizationRatingComment.last
+    rating_task.finish
+
+    get :new_rating, profile: @community.identifier
+    assert_no_tag :tag => 'p', :content => /Report waiting for approva/, :attributes => {:class =>/comment-rejected-msg/}
+    assert_tag :tag => 'p', :content => /comment accepted/, :attributes => {:class =>/comment-body/}
+  end
 end
@@ -0,0 +1,44 @@
+require 'test_helper'
+class CreateOrganizationRatingCommentTest < ActiveSupport::TestCase
+
+  def setup
+    @person = create_user('Mario').person
+    @person.email = "person@email.com"
+    @person.save
+    @community = fast_create(Community)
+    @adminuser = Person[create_admin_user(Environment.default)]
+    @rating = fast_create(OrganizationRating, {:value => 1,
+                                               :person_id => @person.id,
+                                               :organization_id => @community.id,
+                                               :created_at => DateTime.now,
+                                               :updated_at => DateTime.now,
+                                              })
+  end
+
+  test "create comment when finish TASK" do
+    create_organization_rating_comment = CreateOrganizationRatingComment.create!(
+      :requestor => @person,
+      :organization_rating_id => @rating.id,
+      :target => @community,
+      :body => "sample comment"
+    )
+    assert_equal Task::Status::ACTIVE, create_organization_rating_comment.status
+    assert_difference 'Comment.count' do
+      create_organization_rating_comment.finish
+    end
+  end
+
+  test "do not create comment when cancel TASK" do
+    create_organization_rating_comment = CreateOrganizationRatingComment.create!(
+      :requestor => @person,
+      :organization_rating_id => @rating.id,
+      :target => @community,
+      :body => "sample comment"
+    )
+    assert_equal Task::Status::ACTIVE, create_organization_rating_comment.status
+    assert_no_difference 'Comment.count' do
+      create_organization_rating_comment.cancel
+    end
+  end
+
+end
-require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
-
+require 'test_helper'
 class OrganizationRatingTest < ActiveSupport::TestCase
+
+  def setup
+    @person = create_user('Mario').person
+    @person.email = "person@email.com"
+    @person.save
+    @community = fast_create(Community)
+    @adminuser = Person[create_admin_user(Environment.default)]
+    @rating = fast_create(OrganizationRating, {:value => 1,
+                                               :person_id => @person.id,
+                                               :organization_id => @community.id,
+                                               :created_at => DateTime.now,
+                                               :updated_at => DateTime.now,
+                                              })
+  end
+
   test "The value must be between 1 and 5" do
     organization_rating1 = OrganizationRating.new :value => -1
     organization_rating2 = OrganizationRating.new :value => 6
@@ -21,57 +35,58 @@ class OrganizationRatingTest &lt; ActiveSupport::TestCase
     assert_equal false, organization_rating2.errors[:value].include?("must be between 1 and 5")
   end
-  test "Create task for create a rating comment" do
-    person = create_user('molly').person
-    person.email = "person@email.com"
-    person.save!
+  test "false return when no active tasks for an Organization Rating" do
+    assert_not @rating.task_active?
+  end
-    community = fast_create(Community)
-    community.add_admin(person)
+  test "true return when an active task exists for an Organization Rating" do
+    CreateOrganizationRatingComment.create!(
+                      :organization_rating_id => @rating.id,
+                      :target => @community,
+                      :requestor => @person)
-    organization_rating = OrganizationRating.create!(
-        :value => 3,
-        :person => person,
-        :organization => community
-    )
-
-    create_organization_rating_comment = CreateOrganizationRatingComment.create!(
-      :requestor => person,
-      :organization_rating_id => organization_rating.id,
-      :target => community
-    )
+    assert_equal Task::Status::ACTIVE, CreateOrganizationRatingComment.last.status
+    assert @rating.task_active?
+  end
-    assert community.tasks.include?(create_organization_rating_comment)
+  test "return false when an cancelled task exists for an Organization Rating" do
+    CreateOrganizationRatingComment.create!(
+                      :organization_rating_id => @rating.id,
+                      :target => @community,
+                      :requestor => @person)
+    CreateOrganizationRatingComment.last.cancel
+    assert_not @rating.task_active?
   end
-    test "Check comment message when Task status = ACTIVE" do
-    person = create_user('molly').person
-    person.email = "person@email.com"
-    person.save!
+  test "display report moderation message to community admin" do
+    moderator = create_user('moderator')
+    @community.add_admin(moderator.person)
+    @rating.stubs(:task_active?).returns(true)
+    assert @rating.display_moderation_message(@adminuser)
+  end
-    community = fast_create(Community)
-    community.add_admin(person)
+  test "display report moderation message to owner" do
+    @rating.stubs(:task_active?).returns(true)
+    assert @rating.display_moderation_message(@person)
+  end
+  test "do not display report moderation message to regular user" do
+    regular_person = fast_create(Person)
+    @rating.stubs(:task_active?).returns(true)
+    assert_not @rating.display_moderation_message(regular_person)
+  end
-    organization_rating = OrganizationRating.create!(
-        :value => 3,
-        :person => person,
-        :organization => community
-    )
+  test "do not display report moderation message to not logged user" do
+    @rating.stubs(:task_active?).returns(true)
+    assert_not @rating.display_moderation_message(nil)
+  end
-    create_organization_rating_comment = CreateOrganizationRatingComment.create!(
-      :requestor => person,
-      :organization_rating_id => organization_rating.id,
-      :target => community,
-      :body => "sample comment"
-    )
-    assert_equal 1, create_organization_rating_comment.status
-    message = "Comment waiting for approval"
-    comment = Comment.find_by_id(create_organization_rating_comment.organization_rating_comment_id)
-    assert_equal message, comment.body
+  test "do not display report moderation message no active task exists" do
+    @rating.stubs(:task_active?).returns(false)
+    assert_not @rating.display_moderation_message(@person)
   end
-  test "Check comment message when Task status = CANCELLED" do
+  test "Create task for create a rating comment" do
     person = create_user('molly').person
     person.email = "person@email.com"
     person.save!
@@ -79,7 +94,6 @@ class OrganizationRatingTest &lt; ActiveSupport::TestCase
     community = fast_create(Community)
     community.add_admin(person)
-
     organization_rating = OrganizationRating.create!(
         :value => 3,
         :person => person,
@@ -89,51 +103,12 @@ class OrganizationRatingTest &lt; ActiveSupport::TestCase
     create_organization_rating_comment = CreateOrganizationRatingComment.create!(
       :requestor => person,
       :organization_rating_id => organization_rating.id,
-      :target => community,
-      :body => "sample comment"
-    )
-    create_organization_rating_comment.cancel
-    assert_equal 2, create_organization_rating_comment.status
-    message = "Comment rejected"
-    comment = Comment.find_by_id(create_organization_rating_comment.organization_rating_comment_id)
-    assert_equal message, comment.body
-  end
-
-  test "Check comment message when Task status = FINISHED" do
-    person = create_user('molly').person
-    person.email = "person@email.com"
-    person.save!
-
-    community = fast_create(Community)
-    community.add_admin(person)
-
-    comment = Comment.create!(source: community,
-                                                 body: "regular comment",
-                                                 author: person)
-
-    organization_rating = OrganizationRating.create!(
-        :value => 3,
-        :person => person,
-        :organization => community,
-        :comment => comment
+      :target => community
     )
-    create_organization_rating_comment = CreateOrganizationRatingComment.create!(
-          :body => comment.body,
-          :requestor => organization_rating.person,
-          :organization_rating_id => organization_rating.id,
-          :target => organization_rating.organization,
-          :body => "sample comment"
-      )
-
-    create_organization_rating_comment.finish
-    assert_equal 3, create_organization_rating_comment.status
-    message = "sample comment"
-    comment = Comment.find_by_id(create_organization_rating_comment.organization_rating_comment_id)
-    assert_equal message, comment.body
+    assert community.tasks.include?(create_organization_rating_comment)
   end
-
   test "Should calculate community's rating average" do
     community = fast_create Community
     p1 = fast_create Person, :name=>"Person 1"
@@ -19,13 +19,12 @@
   <% if @rating_available %>
     <div class="star-rate-form">
-      <div data-rate-url=<%= url_for controller: "organization_ratings_plugin_profile", :action => "rate" %>>
+      <div data-rate-url='<%= url_for controller: "organization_ratings_plugin_profile", :action => "rate" %>'>
         <div class="star-rate-text">
           <%= @plugins.dispatch(:organization_ratings_plugin_star_message).collect { |content| instance_exec(&content) }.join("") %>
         </div>
         <div class="star-container" data-min-rate="<%= min_rate %>">
-
           <% (1..5).each do |rate_number| %>
             <% if rate_number <= default_rating %>
               <div class="star-positive" data-star-rate="<%= rate_number %>"></div>
@@ -43,8 +42,8 @@
       <div class="star-comment-container">
         <%= form_for :comments do |c| %>
           <div class="formfieldline formfield type-text">
-              <%= c.label :body, _('Comment (Optional):'), :class => "formlabel" %>
-              <%= c.text_area :body %>
+            <%= c.label :body, _('Comment (Optional):'), :class => "formlabel" %>
+            <%= c.text_area :body %>
           </div>
           <%= @plugins.dispatch(:organization_ratings_plugin_comments_extra_fields).collect { |content| instance_exec(&content) }.join("") %>
@@ -57,24 +56,22 @@
           <input type="hidden" id="minimum_stars" name="organization_rating_min_value" value="<%= min_rate %>">
         <% end %>
       </div>
+    </div>
+  <% elsif env_organization_ratings_config.vote_once %>
+    <div class="star-rate-form rating-vote-once">
+      <%= _("Hi, %s! The administrators set that you can vote") % current_user.name %>
+      <strong><%= _("only once") %></strong>
+      <%= _("for this %s.") % profile.class.name.downcase %>
+      <%= render :partial => 'shared/rating_button', :locals => { :disabled => true } %>
+    </div>
+  <% else %>
+    <div class="star-rate-form rating-cooldown">
+      <%= _("Hi, %s! The administrators set the minimum time of") % current_user.name %>
+      <strong><%= _("%d hour(s)") % env_organization_ratings_config.cooldown %></strong>
+      <%= _("between each evaluation.") %>
-    <% elsif env_organization_ratings_config.vote_once %>
-      <div class="star-rate-form rating-vote-once">
-        <%= _("Hi, %s! The administrators set that you can vote") % current_user.name %>
-        <strong><%= _("only once") %></strong>
-        <%= _("for this %s.") % profile.class.name.downcase %>
-        <%= render :partial => 'shared/rating_button', :locals => { :disabled => true } %>
-      </div>
-    <% else %>
-      <div class="star-rate-form rating-cooldown">
-        <%= _("Hi, %s! The administrators set the minimum time of") % current_user.name %>
-        <strong><%= _("%d hour(s)") % env_organization_ratings_config.cooldown %></strong>
-        <%= _("between each evaluation.") %>
-
-        <%= render :partial => 'shared/rating_button', :locals => { :disabled => true } %>
-      </div>
-    <% end %>
-
+      <%= render :partial => 'shared/rating_button', :locals => { :disabled => true } %>
+    </div>
+  <% end %>
-  </div>
 </div>
@@ -25,9 +25,13 @@
     </div>
     <div class="user-testimony">
-      <%= user_rate.comment.nil? ? _("No comment") : user_rate.comment.body %>
+      <% if user_rate.display_moderation_message(user) %>
+        <p class="moderation-msg"><%= _("Report waiting for approval") %></p>
+      <% end %>
+      <% if user_rate.comment.present? %>
+        <p class="comment-body"> <%= user_rate.comment.body %> </p>
+      <% end %>
     </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">
-  <%= _("Comment:")%>
-  <%= "\"#{task.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">
+    <span><%= _("Description:")%></span>
+    <p><%= "\"#{task.body}\""%></p>
+  </div>
+
+  <span class="rating-notice"><%= _("* The rating score is not moderated.")%></span>
+  <div class="task-star-container">
+    <% (1..5).each do |star_number| %>
+      <% if star_number <= rating.value %>
+        <div class="medium-star-positive"></div>
+      <% else %>
+        <div class="medium-star-negative"></div>
+      <% end %>
+    <% end %>
+  </div>
 </div>
@@ -27,6 +27,7 @@ div.pending-tasks {
 }
 .task_box {
+  overflow: hidden;
   position: relative;
   border: 1px solid #888;
   -moz-border-radius: 10px;
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+class DestroyRejectedReports < ActiveRecord::Migration
	2	+ def up
	3	+ comments = []
	4	+ select_all("SELECT data FROM tasks WHERE type = 'CreateOrganizationRatingComment' AND status = 2").each do \|task\|
	5	+ settings = YAML.load(task['data'])
	6	+ comments << settings[:organization_rating_comment_id]
	7	+ end
	8	+ execute("DELETE FROM comments WHERE id IN (#{comments.join(',')})")
	9	+ end
	10	+
	11	+ def down
	12	+ say "This migration can't be reverted"
	13	+ end
	14	+end
	@@ -13,6 +13,18 @@ class OrganizationRating < ActiveRecord::Base		@@ -13,6 +13,18 @@ class OrganizationRating < ActiveRecord::Base
13	validates :organization_id, :person_id,	13	validates :organization_id, :person_id,
14	:presence => true	14	:presence => true
15		15
		16	+ def display_moderation_message person
		17	+ if person.present?
		18	+ task_active? && (person.is_admin? \|\| person == self.person \|\|
		19	+ self.organization.is_admin?(person))
		20	+ end
		21	+ end
		22	+
		23	+ def task_active?
		24	+ tasks = CreateOrganizationRatingComment.where(:target_id => self.organization.id,
		25	+ :status => Task::Status::ACTIVE)
		26	+ tasks.detect {\|t\| t.organization_rating_id == self.id}.present?
		27	+ end
16		28
17	def self.average_rating organization_id	29	def self.average_rating organization_id
18	average = OrganizationRating.where(organization_id: organization_id).average(:value)	30	average = OrganizationRating.where(organization_id: organization_id).average(:value)
	@@ -17,6 +17,7 @@ class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCas		@@ -17,6 +17,7 @@ class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCas
17		17
18	@person = create_user('testuser').person	18	@person = create_user('testuser').person
19	@community = Community.create(:name => "TestCommunity")	19	@community = Community.create(:name => "TestCommunity")
		20	+ @community.add_admin @person
20	@enterprise = fast_create(Enterprise)	21	@enterprise = fast_create(Enterprise)
21	@config = OrganizationRatingsConfig.instance	22	@config = OrganizationRatingsConfig.instance
22	login_as(@person.identifier)	23	login_as(@person.identifier)
	@@ -36,13 +37,13 @@ class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCas		@@ -36,13 +37,13 @@ class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCas
36	assert_redirected_to @community.url	37	assert_redirected_to @community.url
37	end	38	end
38		39
39	- test "Create community_rating without comment body" do	40	+ test "create community_rating without comment body" do
40	post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => 2	41	post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => 2
41		42
42	assert_equal "#{@community.name} successfully rated!", session[:notice]	43	assert_equal "#{@community.name} successfully rated!", session[:notice]
43	end	44	end
44		45
45	- test "Do not create community_rating without a rate value" do	46	+ test "do not create community_rating without a rate value" do
46	post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => nil	47	post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => nil
47		48
48	assert_equal "Sorry, there were problems rating this profile.", session[:notice]	49	assert_equal "Sorry, there were problems rating this profile.", session[:notice]
	@@ -76,13 +77,13 @@ class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCas		@@ -76,13 +77,13 @@ class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCas
76	block = StatisticsBlock.new	77	block = StatisticsBlock.new
77	enterprise = fast_create(Enterprise)	78	enterprise = fast_create(Enterprise)
78	post :new_rating, profile: enterprise.identifier, :comments => {:body => "body board"}, :organization_rating_value => 1	79	post :new_rating, profile: enterprise.identifier, :comments => {:body => "body board"}, :organization_rating_value => 1
		80	+ CreateOrganizationRatingComment.last.finish
79	enterprise.reload	81	enterprise.reload
80	@environment.reload	82	@environment.reload
81	block.expects(:owner).at_least_once.returns(@environment)	83	block.expects(:owner).at_least_once.returns(@environment)
82	assert_equal 1, block.comments	84	assert_equal 1, block.comments
83	end	85	end
84		86
85	-
86	test "should count organization ratings on statistic block when block owner = Profile" do	87	test "should count organization ratings on statistic block when block owner = Profile" do
87	@config.cooldown = 0	88	@config.cooldown = 0
88	@config.save	89	@config.save
	@@ -91,13 +92,15 @@ class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCas		@@ -91,13 +92,15 @@ class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCas
91		92
92	post :new_rating, profile: @community.identifier, :comments => {:body => "body board"}, :organization_rating_value => 1	93	post :new_rating, profile: @community.identifier, :comments => {:body => "body board"}, :organization_rating_value => 1
93	post :new_rating, profile: @community.identifier, :comments => {:body => "body surf"}, :organization_rating_value => 5	94	post :new_rating, profile: @community.identifier, :comments => {:body => "body surf"}, :organization_rating_value => 5
94	-	95	+ CreateOrganizationRatingComment.all.each do \|s\|
		96	+ s.finish
		97	+ end
95	block.expects(:owner).at_least_once.returns(@community)	98	block.expects(:owner).at_least_once.returns(@community)
96	@community.reload	99	@community.reload
97	assert_equal 2, block.comments	100	assert_equal 2, block.comments
98	end	101	end
99		102
100	- test "Display unavailable rating message for users that must wait the rating cooldown time" do	103	+ test "display unavailable rating message for users that must wait the rating cooldown time" do
101	post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => 3	104	post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => 3
102	assert_no_match(/The administrators set the minimum time of/, @response.body)	105	assert_no_match(/The administrators set the minimum time of/, @response.body)
103	valid_rating = OrganizationRating.last	106	valid_rating = OrganizationRating.last
	@@ -108,4 +111,81 @@ class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCas		@@ -108,4 +111,81 @@ class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCas
108		111
109	assert_equal valid_rating.id, new_rating.id	112	assert_equal valid_rating.id, new_rating.id
110	end	113	end
		114	+
		115	+ test "display moderation report message body to community admin" do
		116	+ @member = create_user('member')
		117	+ @community.add_member @member.person
		118	+ login_as 'member'
		119	+ @controller.stubs(:current_user).returns(@member)
		120	+
		121	+ post :new_rating, profile: @community.identifier, :comments => {:body => "comment"}, :organization_rating_value => 3
		122	+
		123	+ login_as 'testuser'
		124	+ @controller.stubs(:current_user).returns(@person.user)
		125	+ get :new_rating, profile: @community.identifier
		126	+ assert_tag :tag => 'p', :content => /Report waiting for approval/, :attributes => {:class =>/moderation-msg/}
		127	+ assert_no_tag :tag => 'p', :attributes => {:class =>/comment-body/}
		128	+ end
		129	+
		130	+ test "display moderation report message to owner" do
		131	+ @member = create_user('member')
		132	+ @community.add_member @member.person
		133	+ login_as 'member'
		134	+ @controller.stubs(:current_user).returns(@member)
		135	+
		136	+ post :new_rating, profile: @community.identifier, :comments => {:body => "comment"}, :organization_rating_value => 3
		137	+ get :new_rating, profile: @community.identifier
		138	+ assert_tag :tag => 'p', :content => /Report waiting for approval/, :attributes => {:class =>/moderation-msg/}
		139	+ assert_no_tag :tag => 'p', :attributes => {:class =>/comment-body/}
		140	+ end
		141	+
		142	+ test "display moderation report message comment to env admin" do
		143	+ post :new_rating, profile: @community.identifier, :comments => {:body => "comment"}, :organization_rating_value => 3
		144	+
		145	+ @admin = create_admin_user(@environment)
		146	+ login_as @admin
		147	+ @controller.stubs(:current_user).returns(Profile[@admin].user)
		148	+
		149	+ get :new_rating, profile: @community.identifier
		150	+ assert_tag :tag => 'p', :content => /Report waiting for approval/, :attributes => {:class =>/moderation-msg/}
		151	+ assert_no_tag :tag => 'p', :attributes => {:class =>/comment-body/}
		152	+ end
		153	+
		154	+ test "not display moderation report message to regular user" do
		155	+ post :new_rating, profile: @community.identifier, :comments => {:body => "comment"}, :organization_rating_value => 3
		156	+ rating_task = CreateOrganizationRatingComment.last
		157	+ rating_task.cancel
		158	+
		159	+ @member = create_user('member')
		160	+ @community.add_member @member.person
		161	+ login_as 'member'
		162	+ @controller.stubs(:current_user).returns(@member)
		163	+
		164	+ get :new_rating, profile: @community.identifier
		165	+ assert_no_tag :tag => 'p', :content => /Report waiting for approval/, :attributes => {:class =>/moderation-msg/}
		166	+ assert_no_tag :tag => 'p', :attributes => {:class =>/comment-body/}
		167	+ end
		168	+
		169	+ test "not display rejected comment message to not logged user" do
		170	+ post :new_rating, profile: @community.identifier, :comments => {:body => "comment"}, :organization_rating_value => 3
		171	+ rating_task = CreateOrganizationRatingComment.last
		172	+ rating_task.cancel
		173	+
		174	+ logout
		175	+ @controller.stubs(:logged_in?).returns(false)
		176	+
		177	+ get :new_rating, profile: @community.identifier
		178	+ assert_no_tag :tag => 'p', :content => /Report waiting for approval/, :attributes => {:class =>/comment-rejected-msg/}
		179	+ assert_no_tag :tag => 'p', :attributes => {:class =>/comment-body/}
		180	+ end
		181	+
		182	+ test "display report when Task accepted" do
		183	+ post :new_rating, profile: @community.identifier, :comments => {:body => "comment accepted"}, :organization_rating_value => 3
		184	+ rating_task = CreateOrganizationRatingComment.last
		185	+ rating_task.finish
		186	+
		187	+ get :new_rating, profile: @community.identifier
		188	+ assert_no_tag :tag => 'p', :content => /Report waiting for approva/, :attributes => {:class =>/comment-rejected-msg/}
		189	+ assert_tag :tag => 'p', :content => /comment accepted/, :attributes => {:class =>/comment-body/}
		190	+ end
111	end	191	end
@@ -0,0 +1,44 @@		@@ -0,0 +1,44 @@
	1	+require 'test_helper'
	2	+class CreateOrganizationRatingCommentTest < ActiveSupport::TestCase
	3	+
	4	+ def setup
	5	+ @person = create_user('Mario').person
	6	+ @person.email = "person@email.com"
	7	+ @person.save
	8	+ @community = fast_create(Community)
	9	+ @adminuser = Person[create_admin_user(Environment.default)]
	10	+ @rating = fast_create(OrganizationRating, {:value => 1,
	11	+ :person_id => @person.id,
	12	+ :organization_id => @community.id,
	13	+ :created_at => DateTime.now,
	14	+ :updated_at => DateTime.now,
	15	+ })
	16	+ end
	17	+
	18	+ test "create comment when finish TASK" do
	19	+ create_organization_rating_comment = CreateOrganizationRatingComment.create!(
	20	+ :requestor => @person,
	21	+ :organization_rating_id => @rating.id,
	22	+ :target => @community,
	23	+ :body => "sample comment"
	24	+ )
	25	+ assert_equal Task::Status::ACTIVE, create_organization_rating_comment.status
	26	+ assert_difference 'Comment.count' do
	27	+ create_organization_rating_comment.finish
	28	+ end
	29	+ end
	30	+
	31	+ test "do not create comment when cancel TASK" do
	32	+ create_organization_rating_comment = CreateOrganizationRatingComment.create!(
	33	+ :requestor => @person,
	34	+ :organization_rating_id => @rating.id,
	35	+ :target => @community,
	36	+ :body => "sample comment"
	37	+ )
	38	+ assert_equal Task::Status::ACTIVE, create_organization_rating_comment.status
	39	+ assert_no_difference 'Comment.count' do
	40	+ create_organization_rating_comment.cancel
	41	+ end
	42	+ end
	43	+
	44	+end
1	<div class="organization-rating-comment-body">	1	<div class="organization-rating-comment-body">
2	- <%= _("Comment:")%>
3	- <%= "\"#{task.body}\""%>	2	+ <% rating = OrganizationRating.find(task.organization_rating_id) %>
		3	+ <%= @plugins.dispatch(:organization_ratings_plugin_task_extra_fields, rating).collect{ \|content\| instance_exec(&content) }.join("") %>
		4	+ <div class="task-comment">
		5	+ <span><%= _("Description:")%></span>
		6	+ <p><%= "\"#{task.body}\""%></p>
		7	+ </div>
		8	+
		9	+ <span class="rating-notice"><%= _("* The rating score is not moderated.")%></span>
		10	+ <div class="task-star-container">
		11	+ <% (1..5).each do \|star_number\| %>
		12	+ <% if star_number <= rating.value %>
		13	+ <div class="medium-star-positive"></div>
		14	+ <% else %>
		15	+ <div class="medium-star-negative"></div>
		16	+ <% end %>
		17	+ <% end %>
		18	+ </div>
4	</div>	19	</div>
	@@ -27,6 +27,7 @@ div.pending-tasks {		@@ -27,6 +27,7 @@ div.pending-tasks {
27	}	27	}
28		28
29	.task_box {	29	.task_box {
		30	+ overflow: hidden;
30	position: relative;	31	position: relative;
31	border: 1px solid #888;	32	border: 1px solid #888;
32	-moz-border-radius: 10px;	33	-moz-border-radius: 10px;