Download as
Browse Code »

Commit c9356f106c85abc85e99150bc67ffc6d8fddad48

Authored by MoisesMachado
1 parent 9410f0e9
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem111: fixed a typo on the permissions protection 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@742 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 12 changed files with 30 additions and 17 deletions   Show diff stats
app/controllers/environment_admin/admin_panel_controller.rb
  Diff comments   View file @c9356f1
1 class AdminPanelController < EnvironmentAdminController 1 class AdminPanelController < EnvironmentAdminController
2 - protect [:index], 'view_environment_admin_panel' 2 + protect [:index], 'view_environment_admin_panel', :environment
3 3
4 end 4 end
app/controllers/environment_admin/categories_controller.rb
  Diff comments   View file @c9356f1
1 class CategoriesController < EnvironmentAdminController 1 class CategoriesController < EnvironmentAdminController
2 2
3 - protect [:index, :new, :edit, :remove], 'manage_environment_categories', environment 3 + protect [:index, :new, :edit, :remove], 'manage_environment_categories', :environment
4 4
5 helper :categories 5 helper :categories
6 6
app/controllers/environment_admin/environment_role_manager_controller.rb
  Diff comments   View file @c9356f1
1 class EnvironmentRoleManagerController < ApplicationController 1 class EnvironmentRoleManagerController < ApplicationController
2 - protect [:index, :change_roles, :update_roles, :change_role, :add_role, :remove_role, :unassociate, :make_admin], 'manage_environment_roles', environment 2 + protect [:index, :change_roles, :update_roles, :change_role, :add_role, :remove_role, :unassociate, :make_admin], 'manage_environment_roles', :environment
3 3
4 def index 4 def index
5 @admins = Person.find(:all, :conditions => ['role_assignments.resource_type = ?', 'Environment'], :include => :role_assignments ) 5 @admins = Person.find(:all, :conditions => ['role_assignments.resource_type = ?', 'Environment'], :include => :role_assignments )
app/controllers/environment_admin/features_controller.rb
  Diff comments   View file @c9356f1
1 class FeaturesController < EnvironmentAdminController 1 class FeaturesController < EnvironmentAdminController
2 - protect [:index, :update], 'edit_environment_features', environment 2 + protect [:index, :update], 'edit_environment_features', :environment
3 3
4 acts_as_environment_admin_controller 4 acts_as_environment_admin_controller
5 5
app/controllers/environment_admin/region_validators_controller.rb
  Diff comments   View file @c9356f1
@@ -2,7 +2,7 @@ class RegionValidatorsController &lt; ApplicationController @@ -2,7 +2,7 @@ class RegionValidatorsController &lt; ApplicationController
2 2
3 before_filter :load_region_and_search, :except => 'index' 3 before_filter :load_region_and_search, :except => 'index'
4 4
5 - protect [:index, :region, :search, :add, :remove], 'manage_environment_validators', environment 5 + protect [:index, :region, :search, :add, :remove], 'manage_environment_validators', :environment
6 def index 6 def index
7 @regions = Region.top_level_for(environment) 7 @regions = Region.top_level_for(environment)
8 end 8 end
app/controllers/environment_admin/role_controller.rb
  Diff comments   View file @c9356f1
1 class RoleController < EnvironmentAdminController 1 class RoleController < EnvironmentAdminController
  2 + protect [:index, :show, :new, :create, :edit, :update, :destroy], 'manage_environment_roles', :enviroment
  3 +
2 def index 4 def index
3 @roles = Role.find(:all) 5 @roles = Role.find(:all)
4 end 6 end
app/controllers/profile_admin/membership_editor_controller.rb
  Diff comments   View file @c9356f1
@@ -4,7 +4,7 @@ class MembershipEditorController &lt; ProfileAdminController @@ -4,7 +4,7 @@ class MembershipEditorController &lt; ProfileAdminController
4 4
5 needs_profile 5 needs_profile
6 6
7 - protect [:index, :new_enterprise, :create_enterprise ], 'edit_profile', profile 7 + protect [:index, :new_enterprise, :create_enterprise ], 'edit_profile', :profile
8 8
9 def index 9 def index
10 @memberships = current_user.person.memberships 10 @memberships = current_user.person.memberships
app/controllers/profile_admin/profile_editor_controller.rb
  Diff comments   View file @c9356f1
@@ -3,8 +3,10 @@ class ProfileEditorController &lt; ProfileAdminController @@ -3,8 +3,10 @@ class ProfileEditorController &lt; ProfileAdminController
3 3
4 design_editor :holder => 'profile', :autosave => true, :block_types => :block_types 4 design_editor :holder => 'profile', :autosave => true, :block_types => :block_types
5 5
6 - protect [:edit], 'edit_profile', profile  
7 - 6 + protect [:edit], 'edit_profile', :profile
  7 +
  8 + needs_profile
  9 +
8 def block_types 10 def block_types
9 { 11 {
10 'ListBlock' => _("List Block"), 12 'ListBlock' => _("List Block"),
app/controllers/profile_admin/profile_members_controller.rb
  Diff comments   View file @c9356f1
1 class ProfileMembersController < ProfileAdminController 1 class ProfileMembersController < ProfileAdminController
2 2
3 - protect [:index, :change_roles, :update_roles, :change_role, :add_role, :remove_role, :unassociate], 'manage_memberships', profile 3 + protect [:index, :change_roles, :update_roles, :change_role, :add_role, :remove_role, :unassociate], 'manage_memberships', :profile
4 4
5 def index 5 def index
6 @members = profile.people.uniq 6 @members = profile.people.uniq
app/models/person.rb
  Diff comments   View file @c9356f1
@@ -15,14 +15,6 @@ class Person &lt; Profile @@ -15,14 +15,6 @@ class Person &lt; Profile
15 # role_assignments.any? {|ra| ra.has_permission?(perm, res)} 15 # role_assignments.any? {|ra| ra.has_permission?(perm, res)}
16 # end 16 # end
17 17
18 -# def define_roles(roles, resource)  
19 -# associations = RoleAssignment.find(:all, :conditions => {:resource_id => resource.id, :resource_type => resource.class.base_class.name, :person_id => self.id })  
20 -# roles_add = roles - associations.map(&:role)  
21 -# roles_remove = associations.map(&:role) - roles  
22 -# associations.each { |a| a.destroy if roles_remove.include?(a.role) }  
23 -# roles_add.each {|r| RoleAssignment.create(:person_id => self.id, :resource_id => resource.id, :resource_type => resource.class.base_class.name, :role_id => r.id) }  
24 -# end  
25 -  
26 def self.conditions_for_profiles(conditions, person) 18 def self.conditions_for_profiles(conditions, person)
27 new_conditions = sanitize_sql(['role_assignments.accessor_id = ?', person]) 19 new_conditions = sanitize_sql(['role_assignments.accessor_id = ?', person])
28 new_conditions << ' AND ' + sanitize_sql(conditions) unless conditions.blank? 20 new_conditions << ' AND ' + sanitize_sql(conditions) unless conditions.blank?
test/fixtures/role_assignments.yml
  Diff comments   View file @c9356f1
@@ -20,3 +20,10 @@ three: @@ -20,3 +20,10 @@ three:
20 role_id: 1 20 role_id: 1
21 resource_id: 6 21 resource_id: 6
22 resource_type: 'Profile' 22 resource_type: 'Profile'
  23 +four:
  24 + id: 4
  25 + accessor_id: 4
  26 + accessor_type: 'Person'
  27 + role_id: 4
  28 + resource_id: 1
  29 + resource_type: 'Environment'
test/fixtures/roles.yml
  Diff comments   View file @c9356f1
@@ -17,3 +17,13 @@ three: @@ -17,3 +17,13 @@ three:
17 name: 'moderator' 17 name: 'moderator'
18 permissions: 18 permissions:
19 - manage_memberships 19 - manage_memberships
  20 +four:
  21 + id: 4
  22 + name: 'admin'
  23 + permissions:
  24 + - view_environment_admin_panel
  25 + - edit_environment_features
  26 + - edit_environment_design
  27 + - manage_environment_categories
  28 + - manage_environment_roles
  29 + - manage_environment_validators