Download as
Browse Code »

Commit 76ed18942b5f0c43af17a678ea7d18de1a599f6e

Authored by Moises Machado
Committed by Antonio Terceiro
1 parent ae454ce9
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

ActionItem1204: made role kind always be defined

Showing 2 changed files with 14 additions and 1 deletions   Show diff stats
test/functional/role_controller_test.rb
  Diff comments   View file @76ed189
... ... @@ -82,4 +82,12 @@ class RoleControllerTest < Test::Unit::TestCase
82 82 assert_not_nil assigns(:role)
83 83 end
84 84 end
  85 +
  86 + should 'not crash when editing role with no permissions' do
  87 + role = Role.create!(:name => 'test_role', :environment => Environment.default)
  88 +
  89 + assert_nothing_raised do
  90 + get :edit, :id => role.id
  91 + end
  92 + end
85 93 end
... ...
vendor/plugins/access_control/lib/role.rb
  Diff comments   View file @76ed189
... ... @@ -32,7 +32,12 @@ class Role < ActiveRecord::Base
32 32 end
33 33  
34 34 def kind
35   - perms.keys.detect{|k| perms[k].keys.include?(permissions[0]) }
  35 + env_perms = perms['Environment'].keys
  36 + if permissions.any?{ |perm| env_perms.include?(perm) }
  37 + 'Environment'
  38 + else
  39 + 'Profile'
  40 + end
36 41 end
37 42  
38 43 def name
... ...