From 6049155a4c2740f39cf57f8201baa16bc65e792e Mon Sep 17 00:00:00 2001
From: Marcela Ribeiro de Oliveira <mro15@inf.ufpr.br>
Date: Mon, 3 Jul 2017 13:16:46 -0300
Subject: [PATCH] change moderator to editor, and curator to moderator
---
app/policies/activity_policy.rb | 2 +-
app/policies/application_policy.rb | 10 +++++-----
app/policies/bookmark_policy.rb | 2 +-
app/policies/collection_policy.rb | 2 +-
app/policies/institution_policy.rb | 10 +++++-----
app/policies/language_policy.rb | 6 +++---
app/policies/learning_object_policy.rb | 6 +++---
app/policies/license_policy.rb | 6 +++---
app/policies/mime_type_policy.rb | 6 +++---
app/policies/object_type_policy.rb | 6 +++---
app/policies/publisher_policy.rb | 8 ++++----
app/policies/rating_policy.rb | 6 +++---
app/policies/search_policy.rb | 2 +-
app/policies/submission_policy.rb | 2 +-
app/policies/user_policy.rb | 8 ++++----
app/policies/welcome_policy.rb | 2 +-
app/serializers/collection_item_serializer.rb | 2 +-
17 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/app/policies/activity_policy.rb b/app/policies/activity_policy.rb
index bdb94fe8..989fa881 100644
--- a/app/policies/activity_policy.rb
+++ b/app/policies/activity_policy.rb
@@ -9,7 +9,7 @@ class ActivityPolicy < ApplicationPolicy
end
def resolve
- if user_can_moderate?
+ if user_can_edit?
scope.includes(:owner,:recipient).order('created_at DESC').all
else
scope.includes(:owner,:recipient).where("privacy = 'public'").where(key: activities_filter).order('created_at DESC').all
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
index d3325157..0f351485 100644
--- a/app/policies/application_policy.rb
+++ b/app/policies/application_policy.rb
@@ -40,7 +40,7 @@ class ApplicationPolicy
def owns?
return false if user.nil?
- return true if user_can_moderate?
+ return true if user_can_edit?
return owner.users.include?(user) if owner.is_a?(Institution)
@@ -55,12 +55,12 @@ class ApplicationPolicy
raise 'You must implement this method!'
end
- def user_can_moderate?
- user.is_admin? || user.is_moderator?
+ def user_can_edit?
+ user.is_admin? || user.is_editor?
end
- def user_can_curate?
- user.is_curator?
+ def user_can_moderate?
+ user.is_moderator?
end
class Scope < ApplicationPolicy
diff --git a/app/policies/bookmark_policy.rb b/app/policies/bookmark_policy.rb
index 9e88edd4..7f7e8483 100644
--- a/app/policies/bookmark_policy.rb
+++ b/app/policies/bookmark_policy.rb
@@ -17,7 +17,7 @@ class BookmarkPolicy < ApplicationPolicy
end
def user_own?
- record.user == user || user_can_moderate?
+ record.user == user || user_can_edit?
end
end
diff --git a/app/policies/collection_policy.rb b/app/policies/collection_policy.rb
index 97214085..0278fd8d 100644
--- a/app/policies/collection_policy.rb
+++ b/app/policies/collection_policy.rb
@@ -8,7 +8,7 @@ class CollectionPolicy < ApplicationPolicy
class Scope < Scope
def resolve
if user_exists?
- if user_can_moderate?
+ if user_can_edit?
scope.all
else
scope.includes(:collection_items).where.not(:collection_items => {:collection_id => nil}).where("privacy = ? OR owner_id = ?", 'public', user.id)
diff --git a/app/policies/institution_policy.rb b/app/policies/institution_policy.rb
index 185b3eff..652d2fb9 100644
--- a/app/policies/institution_policy.rb
+++ b/app/policies/institution_policy.rb
@@ -1,21 +1,21 @@
class InstitutionPolicy < ApplicationPolicy
def create?
- record if user_can_moderate?
+ record if user_can_edit?
end
def update?
- record if user_can_moderate?
+ record if user_can_edit?
end
def index?
- record if user_can_moderate?
+ record if user_can_edit?
end
def destroy?
- record if user_can_moderate?
+ record if user_can_edit?
end
def users?
- record if user_can_moderate?
+ record if user_can_edit?
end
end
diff --git a/app/policies/language_policy.rb b/app/policies/language_policy.rb
index cae7a10e..916e5ccf 100644
--- a/app/policies/language_policy.rb
+++ b/app/policies/language_policy.rb
@@ -8,14 +8,14 @@ class LanguagePolicy < ApplicationPolicy
end
def create?
- record if user_can_moderate?
+ record if user_can_edit?
end
def update?
- record if user_can_moderate?
+ record if user_can_edit?
end
def destroy?
- record if user_can_moderate?
+ record if user_can_edit?
end
end
diff --git a/app/policies/learning_object_policy.rb b/app/policies/learning_object_policy.rb
index 70dd4d64..43aaf53e 100644
--- a/app/policies/learning_object_policy.rb
+++ b/app/policies/learning_object_policy.rb
@@ -10,7 +10,7 @@ class LearningObjectPolicy < ApplicationPolicy
def resolve
if user.nil?
scope.where(state: 'published')
- elsif user_can_moderate?
+ elsif user_can_edit?
scope.all
else
scope.where(state: 'published')
@@ -27,7 +27,7 @@ class LearningObjectPolicy < ApplicationPolicy
end
def publish?
- record if user_can_curate? && record.submitted?
+ record if user_can_moderate? && record.submitted?
end
def destroy?
@@ -43,7 +43,7 @@ class LearningObjectPolicy < ApplicationPolicy
end
def show?
- return record if record.published? || ( !user.nil? && user_can_moderate? )
+ return record if record.published? || ( !user.nil? && user_can_edit? )
return record if user == record.publisher
## TODO: falta verificar se o +record.publisher+ é uma instituição e +user+ faz parte
# => return owner.users.include?(user) if owner.is_a?(Institution) (???)
diff --git a/app/policies/license_policy.rb b/app/policies/license_policy.rb
index de80c911..809cd94d 100644
--- a/app/policies/license_policy.rb
+++ b/app/policies/license_policy.rb
@@ -8,14 +8,14 @@ class LicensePolicy < ApplicationPolicy
end
def create?
- record if user_can_moderate?
+ record if user_can_edit?
end
def update?
- record if user_can_moderate?
+ record if user_can_edit?
end
def destroy?
- record if user_can_moderate?
+ record if user_can_edit?
end
end
diff --git a/app/policies/mime_type_policy.rb b/app/policies/mime_type_policy.rb
index 1ae25251..275e8ea1 100644
--- a/app/policies/mime_type_policy.rb
+++ b/app/policies/mime_type_policy.rb
@@ -8,14 +8,14 @@ class MimeTypePolicy < ApplicationPolicy
end
def create?
- record if user_can_moderate?
+ record if user_can_edit?
end
def update?
- record if user_can_moderate?
+ record if user_can_edit?
end
def destroy?
- record if user_can_moderate?
+ record if user_can_edit?
end
end
diff --git a/app/policies/object_type_policy.rb b/app/policies/object_type_policy.rb
index 22633e54..979ade3d 100644
--- a/app/policies/object_type_policy.rb
+++ b/app/policies/object_type_policy.rb
@@ -8,14 +8,14 @@ class ObjectTypePolicy < ApplicationPolicy
end
def create?
- record if user_can_moderate?
+ record if user_can_edit?
end
def update?
- record if user_can_moderate?
+ record if user_can_edit?
end
def destroy?
- record if user_can_moderate?
+ record if user_can_edit?
end
end
diff --git a/app/policies/publisher_policy.rb b/app/policies/publisher_policy.rb
index 24158d58..be5c084a 100644
--- a/app/policies/publisher_policy.rb
+++ b/app/policies/publisher_policy.rb
@@ -12,7 +12,7 @@ module PublisherPolicy
def resolve
if user.nil?
scope.where(privacy: 'public')
- elsif user_can_moderate? || record == user
+ elsif user_can_edit? || record == user
scope.all
else
scope.where(privacy: 'public')
@@ -21,15 +21,15 @@ module PublisherPolicy
end
def show_all_drafts?
- record if same_user? || user_can_moderate?
+ record if same_user? || user_can_edit?
end
def show_liked_learning_objects?
- record if same_user? || user_can_moderate?
+ record if same_user? || user_can_edit?
end
def show_liked_collections?
- record if same_user? || user_can_moderate?
+ record if same_user? || user_can_edit?
end
def same_user?
diff --git a/app/policies/rating_policy.rb b/app/policies/rating_policy.rb
index bd3c4907..6a4cce8f 100644
--- a/app/policies/rating_policy.rb
+++ b/app/policies/rating_policy.rb
@@ -9,14 +9,14 @@ class RatingPolicy < ApplicationPolicy
end
def create?
- record if user_can_moderate?
+ record if user_can_edit?
end
def update?
- record if user_can_moderate?
+ record if user_can_edit?
end
def destroy?
- record if user_can_moderate?
+ record if user_can_edit?
end
end
diff --git a/app/policies/search_policy.rb b/app/policies/search_policy.rb
index 7a3d5808..6e3df72e 100644
--- a/app/policies/search_policy.rb
+++ b/app/policies/search_policy.rb
@@ -3,7 +3,7 @@ class SearchPolicy < ApplicationPolicy
def resolve
if user.nil?
scope.where(state: 'published')
- elsif user_can_moderate?
+ elsif user_can_edit?
scope.all
else
scope.where(state: 'published')
diff --git a/app/policies/submission_policy.rb b/app/policies/submission_policy.rb
index f3c1ced3..baaa62c6 100644
--- a/app/policies/submission_policy.rb
+++ b/app/policies/submission_policy.rb
@@ -6,7 +6,7 @@ module SubmissionPolicy
def submissions?
return false if user.nil?
- record if user_can_curate?
+ record if user_can_moderate?
end
end
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
index 1deecdaa..cb263c1d 100644
--- a/app/policies/user_policy.rb
+++ b/app/policies/user_policy.rb
@@ -21,21 +21,21 @@ class UserPolicy < ApplicationPolicy
end
def own_reviews?
- record if same_user? || user_can_moderate?
+ record if same_user? || user_can_edit?
end
def received_reviews?
- record if same_user? || user_can_moderate?
+ record if same_user? || user_can_edit?
end
def authorized_user?
return false if ( record.is_admin? && !user.is_admin? )
- if ( record.is_moderator? )
+ if ( record.is_editor? )
if !( same_user? || user.is_admin? )
return false
end
end
- user_can_moderate?
+ user_can_edit?
end
def same_user?
diff --git a/app/policies/welcome_policy.rb b/app/policies/welcome_policy.rb
index 5062601c..7f9d76bc 100644
--- a/app/policies/welcome_policy.rb
+++ b/app/policies/welcome_policy.rb
@@ -1,7 +1,7 @@
class WelcomePolicy < ApplicationPolicy
class Scope < Scope
def resolve
- if user_can_moderate?
+ if user_can_edit?
scope.all
else
scope.where(state: 'published')
diff --git a/app/serializers/collection_item_serializer.rb b/app/serializers/collection_item_serializer.rb
index 5bb19b6e..4f843f78 100644
--- a/app/serializers/collection_item_serializer.rb
+++ b/app/serializers/collection_item_serializer.rb
@@ -4,7 +4,7 @@ class CollectionItemSerializer < ActiveModel::Serializer
def collectionable
if ( object.collectionable_type == "LearningObject" )
serializer = ::LearningObjectSerializer
- elsif ( object.public? || (current_user && ( object.owner?(current_user) || current_user.can_moderate? )) )
+ elsif ( object.public? || (current_user && ( object.owner?(current_user) || current_user.can_edit? )) )
serializer = ::CollectionMinSerializer
end
--
GitLab