Download as
Browse Code »

Commit b3cf98f7d72d304ef3114a87a0a260b5f8a1f25d

Authored by JoenioCosta
1 parent d6f15e02
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem378: define permissions to tasks 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1884 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 10 changed files with 43 additions and 1 deletions   Show diff stats
app/controllers/my_profile/profile_editor_controller.rb
  Diff comments   View file @b3cf98f
... ... @@ -3,7 +3,7 @@ class ProfileEditorController < MyProfileController
3 3 protect 'edit_profile', :profile, :only => [:index, :edit]
4 4  
5 5 def index
6   - @pending_tasks = profile.tasks.pending
  6 + @pending_tasks = profile.tasks.pending.select{|i| user.has_permission?(i.permission, profile)}
7 7 end
8 8  
9 9 helper :profile
... ...
app/models/add_friend.rb
  Diff comments   View file @b3cf98f
... ... @@ -25,4 +25,8 @@ class AddFriend < Task
25 25 _('%s wants to be your friend') % requestor.name
26 26 end
27 27  
  28 + def permission
  29 + :manage_friends
  30 + end
  31 +
28 32 end
... ...
app/models/add_member.rb
  Diff comments   View file @b3cf98f
... ... @@ -25,4 +25,8 @@ class AddMember < Task
25 25 _('%s wants to be a member') % requestor.name
26 26 end
27 27  
  28 + def permission
  29 + :manage_memberships
  30 + end
  31 +
28 32 end
... ...
app/models/create_enterprise.rb
  Diff comments   View file @b3cf98f
... ... @@ -164,4 +164,8 @@ class CreateEnterprise < Task
164 164 msg
165 165 end
166 166  
  167 + def permission
  168 + :validate_enterprise
  169 + end
  170 +
167 171 end
... ...
app/models/task.rb
  Diff comments   View file @b3cf98f
... ... @@ -116,6 +116,11 @@ class Task < ActiveRecord::Base
116 116 nil
117 117 end
118 118  
  119 + # What permission is required to perform task?
  120 + def permission
  121 + :perform_task
  122 + end
  123 +
119 124 protected
120 125  
121 126 # This method must be overrided in subclasses, and its implementation must do
... ...
test/unit/add_friend_test.rb
  Diff comments   View file @b3cf98f
... ... @@ -82,4 +82,9 @@ class AddFriendTest < ActiveSupport::TestCase
82 82 assert_equal 'testuser1 wants to be your friend', task.description
83 83 end
84 84  
  85 + should 'has permission to manage friends' do
  86 + t = AddFriend.new
  87 + assert_equal :manage_friends, t.permission
  88 + end
  89 +
85 90 end
... ...
test/unit/add_member_test.rb
  Diff comments   View file @b3cf98f
... ... @@ -66,4 +66,9 @@ class AddMemberTest < ActiveSupport::TestCase
66 66 assert_same t.target, t.community
67 67 end
68 68  
  69 + should 'has permission to manage members' do
  70 + t = AddMember.new
  71 + assert_equal :manage_memberships, t.permission
  72 + end
  73 +
69 74 end
... ...
test/unit/change_password_test.rb
  Diff comments   View file @b3cf98f
... ... @@ -105,5 +105,10 @@ class ChangePasswordTest < Test::Unit::TestCase
105 105 end
106 106 end
107 107  
  108 + should 'has default permission' do
  109 + t1 = Task.new
  110 + t2 = ChangePassword.new
  111 + assert_equal t1.permission, t2.permission
  112 + end
108 113  
109 114 end
... ...
test/unit/create_enterprise_test.rb
  Diff comments   View file @b3cf98f
... ... @@ -186,4 +186,9 @@ class CreateEnterpriseTest < Test::Unit::TestCase
186 186 assert request.errors.invalid?(:identifier)
187 187 end
188 188  
  189 + should 'has permission to validate enterprise' do
  190 + t = CreateEnterprise.new
  191 + assert_equal :validate_enterprise, t.permission
  192 + end
  193 +
189 194 end
... ...
test/unit/task_test.rb
  Diff comments   View file @b3cf98f
... ... @@ -169,6 +169,11 @@ class TaskTest < Test::Unit::TestCase
169 169 assert_equal [t2], Task.finished
170 170 end
171 171  
  172 + should 'has perform task permission' do
  173 + t = Task.new
  174 + assert_equal :perform_task, t.permission
  175 + end
  176 +
172 177 protected
173 178  
174 179 def sample_user
... ...