Download as
Browse Code »

Commit b0bac8a689e2ee0e81e5f537c1714602b5576b51

Authored by Victor Costa
1 parent b9800000
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

Fix role kind resolution

Showing 3 changed files with 13 additions and 6 deletions   Show diff stats
test/fixtures/roles.yml
  Diff comments   View file @b0bac8a
@@ -55,6 +55,10 @@ profile_admin: @@ -55,6 +55,10 @@ profile_admin:
55 - view_private_content 55 - view_private_content
56 - manage_products 56 - manage_products
57 - send_mail_to_members 57 - send_mail_to_members
  58 + - edit_appearance
  59 + - manage_friends
  60 + - validate_enterprise
  61 + - publish_content
58 profile_member: 62 profile_member:
59 id: 6 63 id: 6
60 environment_id: 1 64 environment_id: 1
test/unit/environment_test.rb
  Diff comments   View file @b0bac8a
@@ -363,6 +363,14 @@ class EnvironmentTest < ActiveSupport::TestCase @@ -363,6 +363,14 @@ class EnvironmentTest < ActiveSupport::TestCase
363 assert_kind_of Role, Environment::Roles.admin(Environment.default.id) 363 assert_kind_of Role, Environment::Roles.admin(Environment.default.id)
364 end 364 end
365 365
  366 + should 'create environment and profile default roles' do
  367 + env = Environment.default
  368 + assert_equal 'Environment', env.roles.find_by_key('environment_administrator').kind
  369 + assert_equal 'Profile', env.roles.find_by_key('profile_admin').kind
  370 + assert_equal 'Profile', env.roles.find_by_key('profile_member').kind
  371 + assert_equal 'Profile', env.roles.find_by_key('profile_moderator').kind
  372 + end
  373 +
366 should 'be able to add admins easily' do 374 should 'be able to add admins easily' do
367 env = Environment.default 375 env = Environment.default
368 user = create_user('testuser').person 376 user = create_user('testuser').person
vendor/plugins/access_control/lib/role.rb
  Diff comments   View file @b0bac8a
@@ -35,12 +35,7 @@ class Role < ActiveRecord::Base @@ -35,12 +35,7 @@ class Role < ActiveRecord::Base
35 end 35 end
36 36
37 def kind 37 def kind
38 - env_perms = perms['Environment'].keys  
39 - if permissions.any?{ |perm| env_perms.include?(perm) }  
40 - 'Environment'  
41 - else  
42 - 'Profile'  
43 - end 38 + key.present? && key.starts_with?('environment_') ? 'Environment' : 'Profile'
44 end 39 end
45 40
46 def name 41 def name