Download as
Browse Code »

Commit ef44b634a1d429ab15c587d0aaf1a00401f9693c

Authored by JoenioCosta
1 parent 38da9b9e
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem378: only show 'Manage Members' if user has permission 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1882 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 6 changed files with 54 additions and 5 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @ef44b63
@@ -295,6 +295,14 @@ class Profile < ActiveRecord::Base @@ -295,6 +295,14 @@ class Profile < ActiveRecord::Base
295 self.affiliate(person, Profile::Roles.admin) 295 self.affiliate(person, Profile::Roles.admin)
296 end 296 end
297 297
  298 + def add_moderator(person)
  299 + if self.has_members?
  300 + self.affiliate(person, Profile::Roles.moderator)
  301 + else
  302 + raise _("%s can't has moderators") % self.class.name
  303 + end
  304 + end
  305 +
298 def self.recent(limit = nil) 306 def self.recent(limit = nil)
299 self.find(:all, :order => 'id desc', :limit => limit) 307 self.find(:all, :order => 'id desc', :limit => limit)
300 end 308 end
app/views/profile_editor/index.rhtml
  Diff comments   View file @ef44b63
1 <div id="profile-editor-index"> 1 <div id="profile-editor-index">
2 2
3 <h1 class="block-title"><%= _('My profile') %></h1> 3 <h1 class="block-title"><%= _('My profile') %></h1>
4 - 4 +
5 <%= render :partial => 'pending_tasks' %> 5 <%= render :partial => 'pending_tasks' %>
6 6
7 <% file_manager do %> 7 <% file_manager do %>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 18
19 <%= file_manager_button(_('Manage friends'), 'icons-app/friends.png', :controller => 'friends', :action => 'index') if profile.person? %> 19 <%= file_manager_button(_('Manage friends'), 'icons-app/friends.png', :controller => 'friends', :action => 'index') if profile.person? %>
20 20
21 - <%= file_manager_button(_('Manage Members'), 'icons-app/members.png', :controller => 'profile_members') if profile.organization? %> 21 + <%= file_manager_button(_('Manage Members'), 'icons-app/members.png', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
22 22
23 <%= file_manager_button(_('Consumed Products'), 'icons-app/consumed_product.png', :controller => 'consumed_products') if profile.enterprise? %> 23 <%= file_manager_button(_('Consumed Products'), 'icons-app/consumed_product.png', :controller => 'consumed_products') if profile.enterprise? %>
24 24
db/migrate/013_access_control_migration.rb
  Diff comments   View file @ef44b63
@@ -37,7 +37,9 @@ class AccessControlMigration &lt; ActiveRecord::Migration @@ -37,7 +37,9 @@ class AccessControlMigration &lt; ActiveRecord::Migration
37 ]) 37 ])
38 38
39 # moderators for enterprises, communities etc 39 # moderators for enterprises, communities etc
40 - Role.create!(:key => 'profile_moderator', :name => N_('Moderator'), :permissions => [ 'manage_memberships', 'edit_profile_design', 'manage_products' ]) 40 + Role.create!(:key => 'profile_moderator', :name => N_('Moderator'), :permissions => [
  41 + 'manage_memberships', 'edit_profile_design', 'manage_products'
  42 + ])
41 43
42 end 44 end
43 end 45 end
test/functional/profile_editor_controller_test.rb
  Diff comments   View file @ef44b63
@@ -284,4 +284,24 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase @@ -284,4 +284,24 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
284 assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'profile_data[closed]' } 284 assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'profile_data[closed]' }
285 end 285 end
286 286
  287 + should 'display manage members options if has permission' do
  288 + profile = Profile['ze']
  289 + community = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact')
  290 + @controller.stubs(:user).returns(profile)
  291 + @controller.stubs(:profile).returns(community)
  292 + profile.stubs(:has_permission?).returns(true)
  293 + get :index, :profile => 'testorg'
  294 + assert_tag :tag => 'a', :content => 'Manage Members'
  295 + end
  296 +
  297 + should 'not display manage members options if has no permission' do
  298 + profile = Profile['ze']
  299 + community = Community.create!(:name => 'test org', :identifier => 'testorg', :contact_person => 'my contact')
  300 + @controller.stubs(:user).returns(profile)
  301 + @controller.stubs(:profile).returns(community)
  302 + profile.stubs(:has_permission?).returns(false)
  303 + get :index, :profile => 'testorg'
  304 + assert_no_tag :tag => 'a', :content => 'Manage Members'
  305 + end
  306 +
287 end 307 end
test/unit/organization_test.rb
  Diff comments   View file @ef44b63
@@ -162,7 +162,7 @@ class OrganizationTest &lt; Test::Unit::TestCase @@ -162,7 +162,7 @@ class OrganizationTest &lt; Test::Unit::TestCase
162 assert_respond_to org, :closed? 162 assert_respond_to org, :closed?
163 end 163 end
164 164
165 - should 'allow to add new members' do 165 + should 'allow to add new member' do
166 o = Organization.create!(:name => 'my test profile', :identifier => 'mytestprofile') 166 o = Organization.create!(:name => 'my test profile', :identifier => 'mytestprofile')
167 p = create_user('mytestuser').person 167 p = create_user('mytestuser').person
168 168
@@ -182,4 +182,15 @@ class OrganizationTest &lt; Test::Unit::TestCase @@ -182,4 +182,15 @@ class OrganizationTest &lt; Test::Unit::TestCase
182 assert_not_includes c.members, p 182 assert_not_includes c.members, p
183 end 183 end
184 184
  185 + # FIXME why members dont return moderators???
  186 + should 'allow to add new moderator' do
  187 + o = Organization.create!(:name => 'my test profile', :identifier => 'mytestprofile')
  188 + p = create_user('myanothertestuser').person
  189 +
  190 + o.add_moderator(p)
  191 + o.reload
  192 +
  193 + assert o.members.include?(p), "Organization should add the new moderator"
  194 + end
  195 +
185 end 196 end
test/unit/profile_test.rb
  Diff comments   View file @ef44b63
@@ -326,7 +326,7 @@ class ProfileTest &lt; Test::Unit::TestCase @@ -326,7 +326,7 @@ class ProfileTest &lt; Test::Unit::TestCase
326 assert_kind_of RssFeed, profile.articles.find_by_path('feed') 326 assert_kind_of RssFeed, profile.articles.find_by_path('feed')
327 end 327 end
328 328
329 - should 'raises when add members' do 329 + should 'not allow to add members' do
330 c = Profile.create!(:name => 'my test profile', :identifier => 'mytestprofile') 330 c = Profile.create!(:name => 'my test profile', :identifier => 'mytestprofile')
331 p = create_user('mytestuser').person 331 p = create_user('mytestuser').person
332 assert_raise RuntimeError do 332 assert_raise RuntimeError do
@@ -343,6 +343,14 @@ class ProfileTest &lt; Test::Unit::TestCase @@ -343,6 +343,14 @@ class ProfileTest &lt; Test::Unit::TestCase
343 assert c.members.include?(p), "Profile should add the new admin" 343 assert c.members.include?(p), "Profile should add the new admin"
344 end 344 end
345 345
  346 + should 'not allow to add moderators' do
  347 + c = Profile.create!(:name => 'my test profile', :identifier => 'mytestprofile')
  348 + p = create_user('mytestuser').person
  349 + assert_raise RuntimeError do
  350 + c.add_moderator(p)
  351 + end
  352 + end
  353 +
346 should 'have tasks' do 354 should 'have tasks' do
347 c = Profile.create!(:name => 'my test profile', :identifier => 'mytestprofile') 355 c = Profile.create!(:name => 'my test profile', :identifier => 'mytestprofile')
348 t1 = c.tasks.build 356 t1 = c.tasks.build