Download as
Browse Code »

Commit 959d88c46b09095b39fafc3fef5061f471037f67

Authored by Moises Machado
Committed by Antonio Terceiro
1 parent 883ddd63
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem1123: fixed listing of other envriroments roles

Showing 2 changed files with 16 additions and 1 deletions   Show diff stats
test/functional/profile_members_controller_test.rb
  Diff comments   View file @959d88c
... ... @@ -97,4 +97,19 @@ class ProfileMembersControllerTest < Test::Unit::TestCase
97 97 assert_not_includes com.members, member
98 98 end
99 99  
  100 + should 'not list roles from other environments' do
  101 + env2 = Environment.create!(:name => 'new env')
  102 + role = Role.create!(:name => 'some role', :environment => env2, :permissions => ['manage_memberships'])
  103 +
  104 + com = Community.create!(:name => 'test community')
  105 + p = create_user_with_permission('test_user', 'manage_memberships', com)
  106 + assert_includes com.members.map(&:name), p.name
  107 +
  108 + login_as :test_user
  109 + get :change_role, :id => p.id, :profile => com.identifier
  110 +
  111 + assert_response :success
  112 + assert_not_includes assigns(:roles), role
  113 + end
  114 +
100 115 end
... ...
vendor/plugins/access_control/lib/acts_as_accessible.rb
  Diff comments   View file @959d88c
... ... @@ -32,7 +32,7 @@ class ActiveRecord::Base
32 32 end
33 33  
34 34 def roles
35   - Role.find(:all).select do |r|
  35 + Role.find_all_by_environment_id(environment.id).select do |r|
36 36 r.permissions.any?{ |p| PERMISSIONS[self.class.base_class.name].include?(p) }
37 37 end
38 38 end
... ...