From e244874f83eed21c9086099ccb7f09d9a6a38f91 Mon Sep 17 00:00:00 2001 From: Simiao Carvalho Date: Mon, 10 Aug 2015 17:41:31 -0300 Subject: [PATCH] Moderation is know for the organization admin --- plugins/communities_ratings/controllers/communities_ratings_plugin_profile_controller.rb | 6 +++++- plugins/communities_ratings/db/migrate/20150710171028_add_communities_rating_config_to_environment.rb | 9 --------- plugins/communities_ratings/lib/create_community_rating_comment.rb | 14 +++++++++----- 3 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 plugins/communities_ratings/db/migrate/20150710171028_add_communities_rating_config_to_environment.rb diff --git a/plugins/communities_ratings/controllers/communities_ratings_plugin_profile_controller.rb b/plugins/communities_ratings/controllers/communities_ratings_plugin_profile_controller.rb index 1eed855..b8b2504 100644 --- a/plugins/communities_ratings/controllers/communities_ratings_plugin_profile_controller.rb +++ b/plugins/communities_ratings/controllers/communities_ratings_plugin_profile_controller.rb @@ -60,7 +60,7 @@ class CommunitiesRatingsPluginProfileController < ProfileController :requestor => community_rating.person, :source => community_rating.community, :community_rating => community_rating, - :environment => environment + :organization => community_rating.community ) ) end @@ -73,4 +73,8 @@ class CommunitiesRatingsPluginProfileController < ProfileController session[:notice] = _("Sorry, there were problems rating this profile.") end end + + def permission + :manage_memberships + end end diff --git a/plugins/communities_ratings/db/migrate/20150710171028_add_communities_rating_config_to_environment.rb b/plugins/communities_ratings/db/migrate/20150710171028_add_communities_rating_config_to_environment.rb deleted file mode 100644 index 9a9fcba..0000000 --- a/plugins/communities_ratings/db/migrate/20150710171028_add_communities_rating_config_to_environment.rb +++ /dev/null @@ -1,9 +0,0 @@ -class AddCommunitiesRatingConfigToEnvironment < ActiveRecord::Migration - def change - add_column :environments, :communities_ratings_cooldown, :integer, :default => 24 - add_column :environments, :communities_ratings_default_rating, :integer, :default => 1 - add_column :environments, :communities_ratings_order, :string, :default => "most recent" - add_column :environments, :communities_ratings_per_page, :integer, :default => 10 - add_column :environments, :communities_ratings_vote_once, :boolean, :default => false - end -end diff --git a/plugins/communities_ratings/lib/create_community_rating_comment.rb b/plugins/communities_ratings/lib/create_community_rating_comment.rb index ab22a38..07a8a6b 100644 --- a/plugins/communities_ratings/lib/create_community_rating_comment.rb +++ b/plugins/communities_ratings/lib/create_community_rating_comment.rb @@ -3,12 +3,12 @@ class CreateCommunityRatingComment < Task validates_presence_of :requestor_id, :community_rating, :target_id - attr_accessible :community_rating, :source, :body, :requestor, :reject_explanation, :environment + attr_accessible :community_rating, :source, :body, :requestor, :reject_explanation, :organization belongs_to :source, :class_name => 'Community', :foreign_key => :source_id belongs_to :community_rating - alias :environment :target - alias :environment= :target= + alias :organization :target + alias :organization= :target= DATA_FIELDS = ['body'] DATA_FIELDS.each do |field| @@ -28,7 +28,7 @@ class CreateCommunityRatingComment < Task end def information - message = _("%{requestor} wants to create a comment in the \"%{source}\" community.
Comment:
\"%{body}\"
") % + message = _("
%{requestor} wants to create a comment in the \"%{source}\" community.
Comment:
\"%{body}\"
") % {:requestor => self.requestor.name, :source => self.source.name, :body => self.body } {:message => message} @@ -38,6 +38,10 @@ class CreateCommunityRatingComment < Task true end + def icon + {:type => :profile_image, :profile => requestor, :url => requestor.url} + end + # tells if this request was rejected def rejected? self.status == Task::Status::CANCELLED @@ -91,7 +95,7 @@ class CreateCommunityRatingComment < Task identifier = self.source.identifier # The use of url_for doesn't allow the /social within the Public Software # portal. That's why the url is mounted so 'hard coded' - url = "#{environment.top_url}/profile/#{identifier}" + url = "#{organization.top_url}/profile/#{identifier}" end end -- libgit2 0.21.2