Download as
Browse Code »

Commit 57d2dac6e6d0344fe9848c947a86e30adae67ccf

Authored by Moises Machado
Committed by Daniela Feitosa
1 parent 704ab1a4
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

ActionItem1080: made roles specific for environment 

     * changed system roles to depend on environment
     * made roles environment specific
Showing 26 changed files with 180 additions and 92 deletions   Show diff stats
app/controllers/admin/role_controller.rb
  Diff comments   View file @57d2dac
... ... @@ -2,11 +2,11 @@ class RoleController < AdminController
2 2 protect 'manage_environment_roles', :environment
3 3  
4 4 def index
5   - @roles = Role.find(:all)
  5 + @roles = environment.roles.find(:all)
6 6 end
7 7  
8 8 def show
9   - @role = Role.find(params[:id])
  9 + @role = environment.roles.find(params[:id])
10 10 end
11 11  
12 12 def new
... ... @@ -15,6 +15,7 @@ class RoleController < AdminController
15 15  
16 16 def create
17 17 @role = Role.new(params[:role])
  18 + @role.environment = environment
18 19 if @role.save
19 20 redirect_to :action => 'show', :id => @role
20 21 else
... ... @@ -24,11 +25,11 @@ class RoleController < AdminController
24 25 end
25 26  
26 27 def edit
27   - @role = Role.find(params[:id])
  28 + @role = environment.roles.find(params[:id])
28 29 end
29 30  
30 31 def update
31   - @role = Role.find(params[:id])
  32 + @role = environment.roles.find(params[:id])
32 33 if @role.update_attributes(params[:role])
33 34 redirect_to :action => 'show', :id => @role
34 35 else
... ... @@ -38,7 +39,7 @@ class RoleController < AdminController
38 39 end
39 40  
40 41 def destroy
41   - @role = Role.find(params[:id])
  42 + @role = environment.roles.find(params[:id])
42 43 if @role.destroy
43 44 redirect_to :action => 'index'
44 45 else
... ...
app/controllers/my_profile/profile_members_controller.rb
  Diff comments   View file @57d2dac
... ... @@ -3,11 +3,11 @@ class ProfileMembersController < MyProfileController
3 3  
4 4 def index
5 5 @members = profile.members
6   - @member_role = Role.find_by_name('member')
  6 + @member_role = environment.roles.find_by_name('member')
7 7 end
8 8  
9 9 def update_roles
10   - @roles = params[:roles] ? Role.find(params[:roles]) : []
  10 + @roles = params[:roles] ? environment.roles.find(params[:roles]) : []
11 11 @roles = @roles.select{|r| r.has_kind?('Profile') }
12 12 @person = Person.find(params[:person])
13 13 if @person.define_roles(@roles, profile)
... ... @@ -26,18 +26,18 @@ class ProfileMembersController < MyProfileController
26 26  
27 27 def add_role
28 28 @person = Person.find(params[:person])
29   - @role = Role.find(params[:role])
  29 + @role = environment.roles.find(params[:role])
30 30 if @profile.affiliate(@person, @role)
31 31 redirect_to :action => 'index'
32 32 else
33 33 @member = Person.find(params[:person])
34   - @roles = Role.find(:all).select{ |r| r.has_kind?('Profile') }
  34 + @roles = environment.roles.find(:all).select{ |r| r.has_kind?('Profile') }
35 35 render :action => 'affiliate'
36 36 end
37 37 end
38 38  
39 39 def remove_role
40   - @association = RoleAssignment.find(params[:id])
  40 + @association = RoleAssignment.find(:all, :conditions => {:id => params[:id], :target_id => profile.id})
41 41 if @association.destroy
42 42 flash[:notice] = 'Member succefully unassociated'
43 43 else
... ...
app/helpers/application_helper.rb
  Diff comments   View file @57d2dac
... ... @@ -610,16 +610,16 @@ module ApplicationHelper
610 610  
611 611 def rolename_for(profile, resource)
612 612 role = profile.role_assignments.find_by_resource_id(resource.id).role
613   - content_tag('span', role.name, :style => "color: #{role_color(role)}")
  613 + content_tag('span', role.name, :style => "color: #{role_color(role, resource.environment.id)}")
614 614 end
615 615  
616   - def role_color(role)
  616 + def role_color(role, env_id)
617 617 case role
618   - when Profile::Roles.admin
  618 + when Profile::Roles.admin(env_id)
619 619 'blue'
620   - when Profile::Roles.member
  620 + when Profile::Roles.member(env_id)
621 621 'green'
622   - when Profile::Roles.moderator
  622 + when Profile::Roles.moderator(env_id)
623 623 'gray'
624 624 else
625 625 'black'
... ...
app/models/add_member.rb
  Diff comments   View file @57d2dac
... ... @@ -11,7 +11,7 @@ class AddMember < Task
11 11 acts_as_having_settings :roles, :field => :data
12 12  
13 13 def perform
14   - self.roles ||= [Profile::Roles.member.id]
  14 + self.roles ||= [Profile::Roles.member(organization.environment.id).id]
15 15 target.affiliate(requestor, self.roles.map{|i| Role.find(i)})
16 16 end
17 17  
... ...
app/models/enterprise.rb
  Diff comments   View file @57d2dac
... ... @@ -82,7 +82,7 @@ class Enterprise < Organization
82 82  
83 83 def enable(owner)
84 84 return if enabled
85   - affiliate(owner, Profile::Roles.all_roles)
  85 + affiliate(owner, Profile::Roles.all_roles(environment.id))
86 86 update_attribute(:enabled,true)
87 87 if environment.replace_enterprise_template_when_enable
88 88 apply_template(template)
... ...
app/models/environment.rb
  Diff comments   View file @57d2dac
... ... @@ -15,8 +15,8 @@ class Environment < ActiveRecord::Base
15 15 }
16 16  
17 17 module Roles
18   - def self.admin
19   - Role.find_by_key('environment_administrator')
  18 + def self.admin(env_id)
  19 + Role.find_by_key_and_environment_id('environment_administrator', env_id)
20 20 end
21 21 end
22 22  
... ... @@ -91,6 +91,8 @@ class Environment < ActiveRecord::Base
91 91  
92 92 has_many :regions
93 93  
  94 + has_many :roles
  95 +
94 96 acts_as_accessible
95 97  
96 98 def superior_intances
... ...
app/models/profile.rb
  Diff comments   View file @57d2dac
... ... @@ -4,23 +4,28 @@
4 4 class Profile < ActiveRecord::Base
5 5  
6 6 module Roles
7   - def self.admin
8   - ::Role.find_by_key('profile_admin')
  7 + def self.admin(env_id)
  8 + find_role('admin', env_id)
9 9 end
10   - def self.member
11   - ::Role.find_by_key('profile_member')
  10 + def self.member(env_id)
  11 + find_role('member', env_id)
12 12 end
13   - def self.moderator
14   - ::Role.find_by_key('profile_moderator')
  13 + def self.moderator(env_id)
  14 + find_role('moderator', env_id)
15 15 end
16   - def self.owner
17   - ::Role.find_by_key('profile_owner')
  16 + def self.owner(env_id)
  17 + find_role('owner', env_id)
18 18 end
19   - def self.editor
20   - ::Role.find_by_key('profile_editor')
  19 + def self.editor(env_id)
  20 + find_role('editor', env_id)
21 21 end
22   - def self.all_roles
23   - [admin, member, moderator, owner, editor]
  22 + def self.all_roles(env_id)
  23 + [admin(env_id), member(env_id), moderator(env_id), owner(env_id), editor(env_id)]
  24 + end
  25 +
  26 + private
  27 + def self.find_role(name, env_id)
  28 + ::Role.find_by_key_and_environment_id("profile_#{name}", env_id)
24 29 end
25 30 end
26 31  
... ... @@ -463,7 +468,7 @@ class Profile &lt; ActiveRecord::Base
463 468 if self.closed?
464 469 AddMember.create!(:person => person, :organization => self)
465 470 else
466   - self.affiliate(person, Profile::Roles.member)
  471 + self.affiliate(person, Profile::Roles.member(environment.id))
467 472 end
468 473 else
469 474 raise _("%s can't has members") % self.class.name
... ... @@ -471,17 +476,17 @@ class Profile &lt; ActiveRecord::Base
471 476 end
472 477  
473 478 def remove_member(person)
474   - self.disaffiliate(person, Profile::Roles.all_roles)
  479 + self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
475 480 end
476 481  
477 482 # adds a person as administrator os this profile
478 483 def add_admin(person)
479   - self.affiliate(person, Profile::Roles.admin)
  484 + self.affiliate(person, Profile::Roles.admin(environment.id))
480 485 end
481 486  
482 487 def add_moderator(person)
483 488 if self.has_members?
484   - self.affiliate(person, Profile::Roles.moderator)
  489 + self.affiliate(person, Profile::Roles.moderator(environment.id))
485 490 else
486 491 raise _("%s can't has moderators") % self.class.name
487 492 end
... ... @@ -600,7 +605,7 @@ class Profile &lt; ActiveRecord::Base
600 605 end
601 606  
602 607 def admins
603   - self.members_by_role(Profile::Roles.admin)
  608 + self.members_by_role(Profile::Roles.admin(environment.id))
604 609 end
605 610  
606 611 def enable_contact?
... ...
app/views/tasks/_add_member.rhtml
  Diff comments   View file @57d2dac
... ... @@ -24,10 +24,10 @@
24 24 <p class="member-classify-suggestions">
25 25 <%= _('Roles:') %> <br>
26 26 <%
27   - @roles = Role.find(:all).select{ |r| r.has_kind?('Profile') }
  27 + @roles = task.target.environment.roles.find(:all).select{ |r| r.has_kind?('Profile') }
28 28 %>
29 29 <% @roles.each do |r| %>
30   - <%= labelled_check_box(r.name, 'task[roles][]', r.id, ( task.target.members.empty? ? true : ( r.id == Profile::Roles.member.id ) ) ) %><br/>
  30 + <%= labelled_check_box(r.name, 'task[roles][]', r.id, ( task.target.members.empty? ? true : ( r.id == Profile::Roles.member(r.environment.id).id ) ) ) %><br/>
31 31 <% end %>
32 32 </p>
33 33 </div>
... ...
db/migrate/069_add_enviroment_id_to_role.rb 0 → 100644
  Diff comments   View file @57d2dac
... ... @@ -0,0 +1,50 @@
  1 +class Environment < ActiveRecord::Base; end
  2 +class Role < ActiveRecord::Base; end
  3 +class RoleWithEnvironment < ActiveRecord::Base
  4 + set_table_name 'roles'
  5 + belongs_to :environment
  6 +end
  7 +class RoleAssignment < ActiveRecord::Base
  8 + belongs_to :accessor, :polymorphic => true
  9 + belongs_to :target, :polymorphic => true
  10 +end
  11 +
  12 +class AddEnviromentIdToRole < ActiveRecord::Migration
  13 + def self.up
  14 + add_column :roles, :environment_id, :integer
  15 +
  16 + roles = Role.find(:all)
  17 + Environment.find(:all).each do |env|
  18 + roles.each do |role|
  19 + re = RoleWithEnvironment.new(role.attributes)
  20 + re.environment = env
  21 + re.save
  22 + RoleAssignment.find_all_by_role_id(role.id).select{|ra| (ra.target.kind_of?(Profile) ? ra.target.environment_id : ra.target.id) == env.id }.each do |ra|
  23 + ra.role_id = re.id
  24 + ra.save
  25 + end
  26 + end
  27 + end
  28 + roles.each(&:destroy)
  29 + end
  30 +
  31 + def self.down
  32 + roles_by_name = {}
  33 + roles_by_key = {}
  34 + roles_with_environment = RoleWithEnvironment.find(:all)
  35 + roles_with_environment.each do |re|
  36 + if re.key
  37 + role = roles_by_name[re.key] || roles_by_key[re.name] || Role.create(re.attributes)
  38 + roles_by_name[role.name] ||= roles_by_key[role.key] ||= role
  39 + end
  40 + role = roles_by_name[re.name] ||= Role.create(re.attributes) unless role
  41 + RoleAssignment.find_all_by_role_id(re.id).each do |ra|
  42 + ra.role_id = role.id
  43 + ra.save
  44 + end
  45 + end
  46 + roles_with_environment.each(&:destroy)
  47 +
  48 + remove_column :roles, :environment_id, :integer
  49 + end
  50 +end
... ...
db/schema.rb
  Diff comments   View file @57d2dac
... ... @@ -9,7 +9,7 @@
9 9 #
10 10 # It's strongly recommended to check this file into your version control system.
11 11  
12   -ActiveRecord::Schema.define(:version => 68) do
  12 +ActiveRecord::Schema.define(:version => 69) do
13 13  
14 14 create_table "article_versions", :force => true do |t|
15 15 t.integer "article_id"
... ... @@ -279,7 +279,8 @@ ActiveRecord::Schema.define(:version =&gt; 68) do
279 279 t.string "name"
280 280 t.text "permissions"
281 281 t.string "key"
282   - t.boolean "system", :default => false
  282 + t.boolean "system", :default => false
  283 + t.integer "environment_id"
283 284 end
284 285  
285 286 create_table "taggings", :force => true do |t|
... ...
lib/tasks/populate.rake
  Diff comments   View file @57d2dac
... ... @@ -13,18 +13,20 @@ namespace :db do
13 13 end
14 14  
15 15 def new_permissions
16   - admin = Profile::Roles.admin
  16 + e = Environment.default
  17 + admin = Profile::Roles.admin(e.id)
17 18 admin.permissions += ['manage_friends', 'validate_enterprise', 'perform_task']
18 19 admin.save
19 20  
20   - moderator = Profile::Roles.moderator
  21 + moderator = Profile::Roles.moderator(e.id)
21 22 moderator.permissions += ['manage_friends', 'perform_task']
22 23 moderator.save
23 24 end
24 25  
25 26 def create_roles
  27 + e = Environment.default
26 28 # Environment administrator!
27   - Role.create!(:key => 'environment_administrator', :name => N_('Environment Administrator'), :permissions => [
  29 + Role.create!(:key => 'environment_administrator', :name => N_('Environment Administrator'), :environment => e, :permissions => [
28 30 'view_environment_admin_panel',
29 31 'edit_environment_features',
30 32 'edit_environment_design',
... ... @@ -39,7 +41,7 @@ def create_roles
39 41 'manage_products',
40 42 'edit_appearance',
41 43 ])
42   - Role.create!(:key => 'profile_admin', :name => N_('Profile Administrator'), :permissions => [
  44 + Role.create!(:key => 'profile_admin', :name => N_('Profile Administrator'), :environment => e, :permissions => [
43 45 'edit_profile',
44 46 'destroy_profile',
45 47 'manage_memberships',
... ... @@ -49,13 +51,13 @@ def create_roles
49 51 'edit_appearance',
50 52 ])
51 53 # members for enterprises, communities etc
52   - Role.create!(:key => "profile_member", :name => N_('Member'), :permissions => [
  54 + Role.create!(:key => "profile_member", :name => N_('Member'), :environment => e, :permissions => [
53 55 'edit_profile',
54 56 'post_content',
55 57 'manage_products'
56 58 ])
57 59 # moderators for enterprises, communities etc
58   - Role.create!(:key => 'profile_moderator', :name => N_('Moderator'), :permissions => [
  60 + Role.create!(:key => 'profile_moderator', :name => N_('Moderator'), :environment => e, :permissions => [
59 61 'manage_memberships',
60 62 'edit_profile_design',
61 63 'manage_products'
... ...
script/anhetegua
  Diff comments   View file @57d2dac
... ... @@ -150,19 +150,19 @@ colivre = new_validator(ba, &quot;Colivre&quot;, &#39;colivre&#39;, Enterprise)
150 150 #forum_rs = new_validator(rs, 'Forum Gaucho de Economia Solidaria', 'ecosolrs')
151 151  
152 152 # Role for own things
153   -owner_role = Profile::Roles.admin
  153 +owner_role = Profile::Roles.admin(Environment.default.id)
154 154  
155 155 # Sample user and sample enterprise owned by him
156 156 ze = User.create!(:login => 'ze', :email => 'ze@localhost.localdomain', :password => 'test', :password_confirmation => 'test').person
157 157  
158   -Environment.default.affiliate(ze, Environment::Roles.admin)
  158 +Environment.default.affiliate(ze, Environment::Roles.admin(Environment.default.id))
159 159 empa = Enterprise.create!(:name => 'Cooperativa A', :identifier => 'coop_a')
160 160  
161 161 empa.affiliate(ze, owner_role)
162 162 colivre.affiliate(ze, owner_role)
163 163  
164   -member_role = Profile::Roles.member
165   -moderator_role = Profile::Roles.moderator
  164 +member_role = Profile::Roles.member(Environment.default.id)
  165 +moderator_role = Profile::Roles.moderator(Environment.default.id)
166 166  
167 167 # product categories
168 168 produtos = ProductCategory.create!(:name => 'Produtos', :environment => Environment.default)
... ...
test/fixtures/roles.yml
  Diff comments   View file @57d2dac
1 1 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2 2 one:
3 3 id: 1
  4 + environment_id: 1
4 5 name: 'member'
5 6 permissions:
6 7 - post_content
7 8 two:
8 9 id: 2
  10 + environment_id: 1
9 11 name: 'owner'
10 12 permissions:
11 13 - menage_memberships
... ... @@ -14,11 +16,13 @@ two:
14 16 - edit_profile
15 17 three:
16 18 id: 3
  19 + environment_id: 1
17 20 name: 'moderator'
18 21 permissions:
19 22 - manage_memberships
20 23 four:
21 24 id: 4
  25 + environment_id: 1
22 26 name: 'admin'
23 27 permissions:
24 28 - view_environment_admin_panel
... ... @@ -31,6 +35,7 @@ four:
31 35 - perform_task
32 36 profile_admin:
33 37 id: 5
  38 + environment_id: 1
34 39 key: 'profile_admin'
35 40 name: 'Profile Administrator'
36 41 system: true
... ... @@ -43,6 +48,7 @@ profile_admin:
43 48 - view_private_content
44 49 profile_member:
45 50 id: 6
  51 + environment_id: 1
46 52 key: 'profile_member'
47 53 name: 'Profile Member'
48 54 system: true
... ... @@ -52,6 +58,7 @@ profile_member:
52 58 - manage_products
53 59 profile_moderator:
54 60 id: 7
  61 + environment_id: 1
55 62 key: 'profile_moderator'
56 63 name: 'Profile Moderator'
57 64 system: true
... ... @@ -60,6 +67,7 @@ profile_moderator:
60 67 - view_private_content
61 68 environment_administrator:
62 69 id: 8
  70 + environment_id: 1
63 71 key: 'environment_administrator'
64 72 name: 'Environment administrator'
65 73 system: true
... ...
test/functional/cms_controller_test.rb
  Diff comments   View file @57d2dac
... ... @@ -626,7 +626,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
626 626  
627 627 should 'load communities for that the user belongs' do
628 628 c = Community.create!(:name => 'test comm', :identifier => 'test_comm')
629   - c.affiliate(profile, Profile::Roles.all_roles)
  629 + c.affiliate(profile, Profile::Roles.all_roles(c.environment.id))
630 630 a = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')
631 631  
632 632 get :publish, :profile => profile.identifier, :id => a.id
... ... @@ -637,7 +637,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
637 637  
638 638 should 'publish the article in the selected community if community is not moderated' do
639 639 c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => false)
640   - c.affiliate(profile, Profile::Roles.all_roles)
  640 + c.affiliate(profile, Profile::Roles.all_roles(c.environment.id))
641 641 a = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')
642 642  
643 643 assert_difference PublishedArticle, :count do
... ... @@ -648,7 +648,7 @@ class CmsControllerTest &lt; Test::Unit::TestCase
648 648  
649 649 should 'create a task for article approval if community is moderated' do
650 650 c = Community.create!(:name => 'test comm', :identifier => 'test_comm', :moderated_articles => true)
651   - c.affiliate(profile, Profile::Roles.all_roles)
  651 + c.affiliate(profile, Profile::Roles.all_roles(c.environment.id))
652 652 a = profile.articles.create!(:name => 'something intresting', :body => 'ruby on rails')
653 653  
654 654 assert_no_difference PublishedArticle, :count do
... ...
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @57d2dac
... ... @@ -490,7 +490,7 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
490 490 person = create_user('test_user').person
491 491 profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
492 492 intranet = Folder.create!(:name => 'my_intranet', :profile => profile, :public_article => false)
493   - profile.affiliate(person, Profile::Roles.member)
  493 + profile.affiliate(person, Profile::Roles.member(profile.environment.id))
494 494 login_as('test_user')
495 495  
496 496 @request.stubs(:ssl?).returns(true)
... ... @@ -503,7 +503,7 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
503 503 person = create_user('test_user').person
504 504 profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
505 505 intranet = Folder.create!(:name => 'my_intranet', :profile => profile, :public_article => false)
506   - profile.affiliate(person, Profile::Roles.moderator)
  506 + profile.affiliate(person, Profile::Roles.moderator(profile.environment.id))
507 507 login_as('test_user')
508 508  
509 509 @request.stubs(:ssl?).returns(true)
... ... @@ -516,7 +516,7 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
516 516 person = create_user('test_user').person
517 517 profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
518 518 intranet = Folder.create!(:name => 'my_intranet', :profile => profile, :public_article => false)
519   - profile.affiliate(person, Profile::Roles.admin)
  519 + profile.affiliate(person, Profile::Roles.admin(profile.environment.id))
520 520 login_as('test_user')
521 521  
522 522 @request.stubs(:ssl?).returns(true)
... ... @@ -566,7 +566,7 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
566 566 should 'not show link to publication on view if not on person profile' do
567 567 prof = Community.create!(:name => 'test comm', :identifier => 'test_comm')
568 568 page = prof.articles.create!(:name => 'myarticle', :body => 'the body of the text')
569   - prof.affiliate(profile, Profile::Roles.all_roles)
  569 + prof.affiliate(profile, Profile::Roles.all_roles(prof.environment.id))
570 570 login_as(profile.identifier)
571 571  
572 572 get :view_page, :profile => prof.identifier, :page => ['myarticle']
... ...
test/functional/memberships_controller_test.rb
  Diff comments   View file @57d2dac
... ... @@ -148,7 +148,7 @@ class MembershipsControllerTest &lt; Test::Unit::TestCase
148 148  
149 149 should 'current user is added as admin after create new community' do
150 150 post :new_community, :profile => profile.identifier, :community => { :name => 'My shiny new community', :description => 'This is a community devoted to anything interesting we find in the internet '}
151   - assert_equal Profile::Roles.admin, profile.find_roles(Community.find_by_identifier('my-shiny-new-community')).first.role
  151 + assert_equal Profile::Roles.admin(profile.environment.id), profile.find_roles(Community.find_by_identifier('my-shiny-new-community')).first.role
152 152 end
153 153  
154 154 should 'display button to create community' do
... ...
test/functional/profile_editor_controller_test.rb
  Diff comments   View file @57d2dac
... ... @@ -13,7 +13,7 @@ class ProfileEditorControllerTest &lt; Test::Unit::TestCase
13 13 @request.stubs(:ssl?).returns(true)
14 14 @response = ActionController::TestResponse.new
15 15 @profile = create_user('default_user').person
16   - Environment.default.affiliate(@profile, [Environment::Roles.admin] + Profile::Roles.all_roles)
  16 + Environment.default.affiliate(@profile, [Environment::Roles.admin(Environment.default.id)] + Profile::Roles.all_roles(Environment.default.id))
17 17 login_as('default_user')
18 18 end
19 19 attr_reader :profile
... ...
test/functional/profile_members_controller_test.rb
  Diff comments   View file @57d2dac
... ... @@ -63,8 +63,8 @@ class ProfileMembersControllerTest &lt; Test::Unit::TestCase
63 63  
64 64 should 'update roles' do
65 65 ent = Enterprise.create!(:identifier => 'test_enterprise', :name => 'test enterprise')
66   - role1 = Role.create!(:name => 'member_role', :permissions => ['edit_profile'])
67   - role2 = Role.create!(:name => 'owner_role', :permissions => ['edit_profile', 'destroy_profile'])
  66 + role1 = Role.create!(:name => 'member_role', :permissions => ['edit_profile'], :environment => ent.environment)
  67 + role2 = Role.create!(:name => 'owner_role', :permissions => ['edit_profile', 'destroy_profile'], :environment => ent.environment)
68 68  
69 69 member = create_user('test_member').person
70 70 member.add_role(role1, ent)
... ...
test/functional/tasks_controller_test.rb
  Diff comments   View file @57d2dac
... ... @@ -78,19 +78,19 @@ class TasksControllerTest &lt; Test::Unit::TestCase
78 78 end
79 79  
80 80 should 'display member role checked if target has members' do
81   - profile.affiliate(profile, Profile::Roles.admin)
  81 + profile.affiliate(profile, Profile::Roles.admin(profile.environment.id))
82 82 assert_equal 1, profile.members.size
83 83 t = AddMember.create!(:person => profile, :organization => profile)
84 84 get :index, :profile => profile.identifier
85   - assert_tag :tag => 'input', :attributes => { :name => 'task[roles][]', :checked => 'checked', :value => Profile::Roles.member.id }
  85 + assert_tag :tag => 'input', :attributes => { :name => 'task[roles][]', :checked => 'checked', :value => Profile::Roles.member(profile.environment.id).id }
86 86 end
87 87  
88 88 should 'display roles besides role member unchecked if target has members' do
89   - profile.affiliate(profile, Profile::Roles.admin)
  89 + profile.affiliate(profile, Profile::Roles.admin(profile.environment.id))
90 90 assert_equal 1, profile.members.size
91 91 t = AddMember.create!(:person => profile, :organization => profile)
92 92 get :index, :profile => profile.identifier
93   - Role.find(:all).select{ |r| r.has_kind?('Profile') and r.id != Profile::Roles.member.id }.each do |i|
  93 + Role.find(:all).select{ |r| r.has_kind?('Profile') and r.id != Profile::Roles.member(profile.environment.id).id }.each do |i|
94 94 assert_no_tag :tag => 'input', :attributes => { :name => 'task[roles][]', :checked => 'checked', :value => i.id }
95 95 end
96 96 end
... ... @@ -157,7 +157,7 @@ class TasksControllerTest &lt; Test::Unit::TestCase
157 157 PublishedArticle.destroy_all
158 158 c = Community.create!(:name => 'test comm', :moderated_articles => false)
159 159 @controller.stubs(:profile).returns(c)
160   - c.affiliate(profile, Profile::Roles.all_roles)
  160 + c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
161 161 article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
162 162 t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => profile)
163 163  
... ... @@ -170,7 +170,7 @@ class TasksControllerTest &lt; Test::Unit::TestCase
170 170 c = Community.create!(:name => 'test comm', :moderated_articles => false)
171 171 @controller.stubs(:profile).returns(c)
172 172 folder = c.articles.create!(:name => 'test folder', :type => 'Folder')
173   - c.affiliate(profile, Profile::Roles.all_roles)
  173 + c.affiliate(profile, Profile::Roles.all_roles(profile.environment.id))
174 174 article = profile.articles.create!(:name => 'something interesting', :body => 'ruby on rails')
175 175 t = ApproveArticle.create!(:name => 'test name', :article => article, :target => c, :requestor => profile)
176 176  
... ...
test/unit/add_member_test.rb
  Diff comments   View file @57d2dac
... ... @@ -76,7 +76,7 @@ class AddMemberTest &lt; ActiveSupport::TestCase
76 76 p = create_user('testuser1').person
77 77 c = Community.create!(:name => 'community_test')
78 78  
79   - roles = [Profile::Roles.member, Profile::Roles.admin]
  79 + roles = [Profile::Roles.member(c.environment.id), Profile::Roles.admin(c.environment.id)]
80 80 TaskMailer.stubs(:deliver_target_notification)
81 81 task = AddMember.create!(:roles => roles.map(&:id), :person => p, :organization => c)
82 82 task.finish
... ...
test/unit/application_helper_test.rb
  Diff comments   View file @57d2dac
... ... @@ -73,16 +73,16 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
73 73 end
74 74  
75 75 should 'role color for admin role' do
76   - assert_equal 'blue', role_color(Profile::Roles.admin)
  76 + assert_equal 'blue', role_color(Profile::Roles.admin(Environment.default.id), Environment.default.id)
77 77 end
78 78 should 'role color for member role' do
79   - assert_equal 'green', role_color(Profile::Roles.member)
  79 + assert_equal 'green', role_color(Profile::Roles.member(Environment.default.id), Environment.default.id)
80 80 end
81 81 should 'role color for moderator role' do
82   - assert_equal 'gray', role_color(Profile::Roles.moderator)
  82 + assert_equal 'gray', role_color(Profile::Roles.moderator(Environment.default.id), Environment.default.id)
83 83 end
84 84 should 'default role color' do
85   - assert_equal 'black', role_color('none')
  85 + assert_equal 'black', role_color('none', Environment.default.id)
86 86 end
87 87  
88 88 should 'rolename for' do
... ...
test/unit/article_test.rb
  Diff comments   View file @57d2dac
... ... @@ -452,7 +452,7 @@ class ArticleTest &lt; Test::Unit::TestCase
452 452 profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
453 453 article = Article.create!(:name => 'test article', :profile => profile, :public_article => false)
454 454 person = create_user('test_user').person
455   - profile.affiliate(person, Profile::Roles.member)
  455 + profile.affiliate(person, Profile::Roles.member(profile.environment.id))
456 456  
457 457 assert !article.display_to?(person)
458 458 end
... ... @@ -461,7 +461,7 @@ class ArticleTest &lt; Test::Unit::TestCase
461 461 profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
462 462 article = Article.create!(:name => 'test article', :profile => profile, :public_article => false)
463 463 person = create_user('test_user').person
464   - profile.affiliate(person, Profile::Roles.admin)
  464 + profile.affiliate(person, Profile::Roles.admin(profile.environment.id))
465 465  
466 466 assert article.display_to?(person)
467 467 end
... ... @@ -470,7 +470,7 @@ class ArticleTest &lt; Test::Unit::TestCase
470 470 profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
471 471 article = Article.create!(:name => 'test article', :profile => profile, :public_article => false)
472 472 person = create_user('test_user').person
473   - profile.affiliate(person, Profile::Roles.moderator)
  473 + profile.affiliate(person, Profile::Roles.moderator(profile.environment.id))
474 474  
475 475 assert article.display_to?(person)
476 476 end
... ... @@ -479,7 +479,7 @@ class ArticleTest &lt; Test::Unit::TestCase
479 479 profile = Profile.create!(:name => 'test profile', :identifier => 'test_profile', :public_profile => false)
480 480 article = Article.create!(:name => 'test article', :profile => profile, :public_article => true)
481 481 person1 = create_user('test_user1').person
482   - profile.affiliate(person1, Profile::Roles.member)
  482 + profile.affiliate(person1, Profile::Roles.member(profile.environment.id))
483 483 person2 = create_user('test_user2').person
484 484  
485 485 assert !article.display_to?(nil)
... ...
test/unit/enterprises_block_test.rb
  Diff comments   View file @57d2dac
... ... @@ -56,8 +56,8 @@ class EnterprisesBlockTest &lt; Test::Unit::TestCase
56 56  
57 57 should 'not list private enterprises in profile' do
58 58 person = create_user('test_user').person
59   - role = Profile::Roles.member
60 59 e1 = Enterprise.create!(:name => 'test1', :identifier => 'test1', :public_profile => true)
  60 + role = Profile::Roles.member(e1.environment.id)
61 61 e1.affiliate(person, role)
62 62 e2 = Enterprise.create!(:name => 'test2', :identifier => 'test2', :public_profile => false) #private profile
63 63 e2.affiliate(person, role)
... ...
test/unit/environment_test.rb
  Diff comments   View file @57d2dac
... ... @@ -308,8 +308,8 @@ class EnvironmentTest &lt; Test::Unit::TestCase
308 308 end
309 309  
310 310 should 'have admin role' do
311   - Role.expects(:find_by_key).with('environment_administrator').returns(Role.new)
312   - assert_kind_of Role, Environment::Roles.admin
  311 + Role.expects(:find_by_key_and_environment_id).with('environment_administrator', Environment.default.id).returns(Role.new)
  312 + assert_kind_of Role, Environment::Roles.admin(Environment.default.id)
313 313 end
314 314  
315 315 should 'have products through enterprises' do
... ... @@ -745,4 +745,22 @@ class EnvironmentTest &lt; Test::Unit::TestCase
745 745  
746 746 assert_equal [], e.portal_folders
747 747 end
  748 +
  749 + should 'have roles with names independent of other environments' do
  750 + e1 = Environment.create!(:name => 'a test environment')
  751 + role1 = Role.create!(:name => 'test_role', :environment => e1)
  752 + e2 = Environment.create!(:name => 'another test environment')
  753 + role2 = Role.new(:name => 'test_role', :environment => e2)
  754 +
  755 + assert_valid role2
  756 + end
  757 +
  758 + should 'have roles with keys independent of other environments' do
  759 + e1 = Environment.create!(:name => 'a test environment')
  760 + role1 = Role.create!(:name => 'test_role', :environment => e1, :key => 'a_member')
  761 + e2 = Environment.create!(:name => 'another test environment')
  762 + role2 = Role.new(:name => 'test_role', :environment => e2, :key => 'a_member')
  763 +
  764 + assert_valid role2
  765 + end
748 766 end
... ...
test/unit/profile_test.rb
  Diff comments   View file @57d2dac
... ... @@ -337,18 +337,18 @@ class ProfileTest &lt; Test::Unit::TestCase
337 337 end
338 338  
339 339 should 'have administator role' do
340   - Role.expects(:find_by_key).with('profile_admin').returns(Role.new)
341   - assert_kind_of Role, Profile::Roles.admin
  340 + Role.expects(:find_by_key_and_environment_id).with('profile_admin', Environment.default.id).returns(Role.new)
  341 + assert_kind_of Role, Profile::Roles.admin(Environment.default.id)
342 342 end
343 343  
344 344 should 'have member role' do
345   - Role.expects(:find_by_key).with('profile_member').returns(Role.new)
346   - assert_kind_of Role, Profile::Roles.member
  345 + Role.expects(:find_by_key_and_environment_id).with('profile_member', Environment.default.id).returns(Role.new)
  346 + assert_kind_of Role, Profile::Roles.member(Environment.default.id)
347 347 end
348 348  
349 349 should 'have moderator role' do
350   - Role.expects(:find_by_key).with('profile_moderator').returns(Role.new)
351   - assert_kind_of Role, Profile::Roles.moderator
  350 + Role.expects(:find_by_key_and_environment_id).with('profile_moderator', Environment.default.id).returns(Role.new)
  351 + assert_kind_of Role, Profile::Roles.moderator(Environment.default.id)
352 352 end
353 353  
354 354 should 'not have members by default' do
... ... @@ -768,9 +768,9 @@ class ProfileTest &lt; Test::Unit::TestCase
768 768 end
769 769  
770 770 should 'not return nil members when a member is removed from system' do
771   - p = Profile.create!(:name => 'test profile', :identifier => 'test_profile')
  771 + p = Community.create!(:name => 'test community', :identifier => 'test_comm')
772 772 member = create_user('test_user').person
773   - p.affiliate(member, Profile::Roles.member)
  773 + p.add_member(member)
774 774  
775 775 member.destroy
776 776 p.reload
... ... @@ -905,7 +905,7 @@ class ProfileTest &lt; Test::Unit::TestCase
905 905 should 'remove member with many roles' do
906 906 person = create_user('test_user').person
907 907 community = Community.create!(:name => 'Boca do Siri', :identifier => 'boca_do_siri')
908   - community.affiliate(person, Profile::Roles.all_roles)
  908 + community.affiliate(person, Profile::Roles.all_roles(community.environment.id))
909 909  
910 910 community.remove_member(person)
911 911  
... ... @@ -1267,8 +1267,8 @@ class ProfileTest &lt; Test::Unit::TestCase
1267 1267 task1 = Task.create!(:requestor => person, :target => env)
1268 1268 task2 = Task.create!(:requestor => person, :target => another)
1269 1269  
1270   - another.affiliate(person, Environment::Roles.admin)
1271   - env.affiliate(person, Environment::Roles.admin)
  1270 + another.affiliate(person, Environment::Roles.admin(another.id))
  1271 + env.affiliate(person, Environment::Roles.admin(env.id))
1272 1272  
1273 1273 Person.any_instance.stubs(:is_admin?).returns(true)
1274 1274  
... ...
vendor/plugins/access_control/lib/role.rb
  Diff comments   View file @57d2dac
1 1 class Role < ActiveRecord::Base
2 2  
3 3 has_many :role_assignments
  4 + belongs_to :environment
4 5 serialize :permissions, Array
5 6 validates_presence_of :name
6   - validates_uniqueness_of :name
7   - validates_uniqueness_of :key, :if => lambda { |role| !role.key.blank? }
  7 + validates_uniqueness_of :name, :scope => :environment_id
  8 + validates_uniqueness_of :key, :if => lambda { |role| !role.key.blank? }, :scope => :environment_id
8 9  
9 10 def initialize(*args)
10 11 super(*args)
... ...