Download as
Browse Code »

Commit 3fc192fcf0021154b544386b3ffad9ecd69b45fb

Authored by Rodrigo Souto
Committed by Daniela Feitosa
1 parent fdf61a5a
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

[multiple-templates] Adding manage_environment_templates permission 

(ActionItem2378)
Showing 4 changed files with 21 additions and 1 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @3fc192f
@@ -24,6 +24,7 @@ class Environment < ActiveRecord::Base @@ -24,6 +24,7 @@ class Environment < ActiveRecord::Base
24 'manage_environment_roles' => N_('Manage environment roles'), 24 'manage_environment_roles' => N_('Manage environment roles'),
25 'manage_environment_validators' => N_('Manage environment validators'), 25 'manage_environment_validators' => N_('Manage environment validators'),
26 'manage_environment_users' => N_('Manage environment users'), 26 'manage_environment_users' => N_('Manage environment users'),
  27 + 'manage_environment_templates' => N_('Manage environment templates'),
27 } 28 }
28 29
29 module Roles 30 module Roles
db/migrate/20120718145131_add_manage_environment_templates_to_admin_role.rb 0 → 100644
  Diff comments   View file @3fc192f
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
  1 +class AddManageEnvironmentTemplatesToAdminRole < ActiveRecord::Migration
  2 + def self.up
  3 + Environment.all.map(&:id).each do |id|
  4 + role = Environment::Roles.admin(id)
  5 + role.permissions << 'manage_environment_templates'
  6 + role.save!
  7 + end
  8 + end
  9 +
  10 + def self.down
  11 + Environment.all.map(&:id).each do |id|
  12 + role = Environment::Roles.admin(id)
  13 + role.permissions -= ['manage_environment_templates']
  14 + role.save!
  15 + end
  16 + end
  17 +end
test/factories.rb
  Diff comments   View file @3fc192f
@@ -58,7 +58,7 @@ module Noosfero::Factory @@ -58,7 +58,7 @@ module Noosfero::Factory
58 ###### old stuff to be rearranged 58 ###### old stuff to be rearranged
59 def create_admin_user(env) 59 def create_admin_user(env)
60 admin_user = User.find_by_login('adminuser') || create_user('adminuser', :email => 'adminuser@noosfero.org', :password => 'adminuser', :password_confirmation => 'adminuser', :environment => env) 60 admin_user = User.find_by_login('adminuser') || create_user('adminuser', :email => 'adminuser@noosfero.org', :password => 'adminuser', :password_confirmation => 'adminuser', :environment => env)
61 - admin_role = Role.find_by_name('admin_role') || Role.create!(:name => 'admin_role', :permissions => ['view_environment_admin_panel','edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_validators', 'manage_environment_users']) 61 + admin_role = Role.find_by_name('admin_role') || Role.create!(:name => 'admin_role', :permissions => ['view_environment_admin_panel','edit_environment_features', 'edit_environment_design', 'manage_environment_categories', 'manage_environment_roles', 'manage_environment_validators', 'manage_environment_users', 'manage_environment_templates'])
62 RoleAssignment.create!(:accessor => admin_user.person, :role => admin_role, :resource => env) unless admin_user.person.role_assignments.map{|ra|[ra.role, ra.accessor, ra.resource]}.include?([admin_role, admin_user, env]) 62 RoleAssignment.create!(:accessor => admin_user.person, :role => admin_role, :resource => env) unless admin_user.person.role_assignments.map{|ra|[ra.role, ra.accessor, ra.resource]}.include?([admin_role, admin_user, env])
63 admin_user.login 63 admin_user.login
64 end 64 end
test/fixtures/roles.yml
  Diff comments   View file @3fc192f
@@ -34,6 +34,7 @@ four: @@ -34,6 +34,7 @@ four:
34 - moderate_comments 34 - moderate_comments
35 - perform_task 35 - perform_task
36 - manage_environment_users 36 - manage_environment_users
  37 + - manage_environment_templates
37 profile_admin: 38 profile_admin:
38 id: 5 39 id: 5
39 environment_id: 1 40 environment_id: 1
@@ -86,3 +87,4 @@ environment_administrator: @@ -86,3 +87,4 @@ environment_administrator:
86 - manage_environment_users 87 - manage_environment_users
87 - edit_profile 88 - edit_profile
88 - destroy_profile 89 - destroy_profile
  90 + - manage_environment_templates