diff --git a/app/controllers/environment_admin/region_validators_controller.rb b/app/controllers/environment_admin/region_validators_controller.rb index c69b550..6c97d2d 100644 --- a/app/controllers/environment_admin/region_validators_controller.rb +++ b/app/controllers/environment_admin/region_validators_controller.rb @@ -2,6 +2,7 @@ class RegionValidatorsController < ApplicationController before_filter :load_region_and_search, :except => 'index' + protect [:index, :region, :search, :add, :remove], 'manage_environment_validators', environment def index @regions = Region.top_level_for(environment) end diff --git a/app/controllers/profile_admin/cms_controller.rb b/app/controllers/profile_admin/cms_controller.rb index 48cabad..a686980 100644 --- a/app/controllers/profile_admin/cms_controller.rb +++ b/app/controllers/profile_admin/cms_controller.rb @@ -5,6 +5,5 @@ class CmsController < ComatoseAdminController define_option :page_class, Article - # not yet - # protect [:edit, :new, :reorder, :delete], :post_content, :profile + protect [:edit, :new, :reorder, :delete], :post_content, :profile end diff --git a/app/controllers/profile_admin/membership_editor_controller.rb b/app/controllers/profile_admin/membership_editor_controller.rb index 2301b1f..f4b09ce 100644 --- a/app/controllers/profile_admin/membership_editor_controller.rb +++ b/app/controllers/profile_admin/membership_editor_controller.rb @@ -4,7 +4,7 @@ class MembershipEditorController < ProfileAdminController needs_profile -# protect [:index, :new_enterprise, :create_enterprise ], 'edit_profile', profile + protect [:index, :new_enterprise, :create_enterprise ], 'edit_profile', profile def index @memberships = current_user.person.memberships diff --git a/app/controllers/profile_admin/profile_editor_controller.rb b/app/controllers/profile_admin/profile_editor_controller.rb index faff76c..256f2b1 100644 --- a/app/controllers/profile_admin/profile_editor_controller.rb +++ b/app/controllers/profile_admin/profile_editor_controller.rb @@ -3,8 +3,7 @@ class ProfileEditorController < ProfileAdminController design_editor :holder => 'profile', :autosave => true, :block_types => :block_types -# protect [:edit], 'edit_profile', profile -# protect [] + protect [:edit], 'edit_profile', profile def block_types { @@ -15,7 +14,6 @@ class ProfileEditorController < ProfileAdminController } end - # edits the profile info (posts back) def edit if request.post? diff --git a/app/controllers/profile_admin/profile_members_controller.rb b/app/controllers/profile_admin/profile_members_controller.rb index 37d1e81..ef87cd4 100644 --- a/app/controllers/profile_admin/profile_members_controller.rb +++ b/app/controllers/profile_admin/profile_members_controller.rb @@ -1,6 +1,6 @@ class ProfileMembersController < ProfileAdminController -# protect [:index, :change_roles, :update_roles, :change_role, :add_role, :remove_role, :unassociate], 'manage_memberships', profile + protect [:index, :change_roles, :update_roles, :change_role, :add_role, :remove_role, :unassociate], 'manage_memberships', profile def index @members = profile.people.uniq diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb index b9b4cbe..ddae049 100644 --- a/app/controllers/public/account_controller.rb +++ b/app/controllers/public/account_controller.rb @@ -36,6 +36,8 @@ class AccountController < PublicController @user.person.environment = environment @user.person.save! self.current_user = @user + owner_role = Role.find_by_name('owner') + @user.person.affiliate(@user.person, [owner_role]) if owner_role redirect_back_or_default(homepage_path(:profile => current_user.login)) flash[:notice] = _("Thanks for signing up!") end diff --git a/script/anhetegua b/script/anhetegua index db2a1ee..ff129e6 100644 --- a/script/anhetegua +++ b/script/anhetegua @@ -56,7 +56,7 @@ owner_role = Role.create!(:name => 'owner', :permissions => ['edit_profile', 'de # root user of the system, admin_role for him, the assignment of the role for him and the ownership of the system homepage root = User.create!(:login => 'root', :email => 'root@noosfero.org', :password => 'root', :password_confirmation => 'root').person -admin_role = Role.create!(:name => 'admin', :permissions => ['edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_validators']) +admin_role = Role.create!(:name => 'admin', :permissions => ['view_environment_admin_panel','edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_validators']) RoleAssignment.create!(:accessor => root, :role => admin_role, :resource => nil) RoleAssignment.create!(:accessor => root, :role => owner_role, :resource => noosfero) -- libgit2 0.21.2