https://bugzilla.redhat.com/show_bug.cgi?id=796797
Make db/seeds use i18n stuff instead of text for role defs. As a side
effect, the UI now uses the keys and pulls the i18n trnaslation as well
---
aeolus-conductor.spec.in | 3 +-
src/app/controllers/permissions_controller.rb | 16 ++--
src/app/views/permissions/_form.html.haml | 2 +-
src/app/views/permissions/_permissions.html.haml | 4 +-
src/config/locales/role_definitions/en.yml | 50 ++++++++
...d_view_hardware_profile_privileges_to_admins.rb | 2 +-
src/db/seeds.rb | 127 ++++++++++----------
src/features/permission.feature | 2 +-
src/lib/tasks/dc_tasks.rake | 4 +-
.../controllers/config_servers_controller_spec.rb | 4 +-
.../provider_accounts_controller_spec.rb | 2 +-
src/spec/factories/permission.rb | 12 +-
12 files changed, 139 insertions(+), 89 deletions(-)
create mode 100644 src/config/locales/role_definitions/en.yml
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index 52b1986..50dea05 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -197,7 +197,8 @@ rhtml="app/views/layouts"
svg="public/images public/images/icons public/javascripts/jquery-svg"
ttf="public/fonts"
txt="public"
-yml="config config/locales config/locales/overrides"
+yml="config config/locales config/locales/overrides config/locales/role_definitions
\
+ config/locales/overrides/role_definitions"
xml="app/util"
for filetype in builder css feature gif haml html ico jpg js json key opts png \
rake rb rhtml scss svg ttf txt yml xml; do
diff --git a/src/app/controllers/permissions_controller.rb
b/src/app/controllers/permissions_controller.rb
index ede9bb8..1545429 100644
--- a/src/app/controllers/permissions_controller.rb
+++ b/src/app/controllers/permissions_controller.rb
@@ -60,10 +60,10 @@ class PermissionsController < ApplicationController
:permission_object => @permission_object)
if permission.save
added << t('permissions.flash.fragment.user_and_role', :user
=> permission.user.login,
- :role => permission.role.name)
+ :role => t(permission.role.name, :scope=> :role_defs,
:default => permission.role.name))
else
not_added << t('permissions.flash.fragment.user_and_role', :user
=> permission.user.login,
- :role => permission.role.name)
+ :role => t(permission.role.name, :scope=> :role_defs,
:default => permission.role.name) )
end
end
end
@@ -98,12 +98,12 @@ class PermissionsController < ApplicationController
permission.role = role
if permission.save
modified <<
t('permissions.flash.fragment.user_and_role_change', :user =>
permission.user.login,
- :old_role => old_role.name,
- :role => permission.role.name)
+ :old_role => t(old_role.name, :scope=> :role_defs,
:default => old_role.name),
+ :role => t(permission.role.name, :scope=> :role_defs,
:default => permission.role.name))
else
not_modified <<
t('permissions.flash.fragment.user_and_role_change', :user =>
permission.user.login,
- :old_role => old_role.name,
- :role => permission.role.name)
+ :old_role => t(old_role.name, :scope=> :role_defs,
:default => old_role.name) ,
+ :role => t(permission.role.name, :scope=> :role_defs,
:default => permission.role.name))
end
end
end
@@ -133,10 +133,10 @@ class PermissionsController < ApplicationController
Permission.find(params[:permission_selected]).each do |p|
if check_privilege(Privilege::PERM_SET, p.permission_object) && p.destroy
deleted << t('permissions.flash.fragment.user_and_role', :user
=> p.user.login,
- :role => p.role.name)
+ :role => t(p.role.name, :scope=> :role_defs, :default =>
p.role.name))
else
not_deleted << t('permissions.flash.fragment.user_and_role', :user
=> p.user.login,
- :role => p.role.name)
+ :role => t(p.role.name, :scope=> :role_defs, :default =>
p.role.name))
end
end
diff --git a/src/app/views/permissions/_form.html.haml
b/src/app/views/permissions/_form.html.haml
index 2a07c88..187cdfa 100644
--- a/src/app/views/permissions/_form.html.haml
+++ b/src/app/views/permissions/_form.html.haml
@@ -12,4 +12,4 @@
%td= link_to user.login, user_path(user)
%td= user.last_name
%td= user.first_name
- %td= select_tag "user_role_selected[]", options_for_select([['',
"#{user.id},"]] + @roles.map {|r| [ r.name, "#{user.id},#{r.id}" ] },
:disabled => @permission_object.permissions.where(:user_id=>user.id).collect {|p|
"#{user.id},#{p.role.id}"}), :id =>
"user_role_selected_#{user.id}"
+ %td= select_tag "user_role_selected[]", options_for_select([['',
"#{user.id},"]] + @roles.map {|r| [t(r.name, :scope=> :role_defs, :default
=> r.name), "#{user.id},#{r.id}" ] }, :disabled =>
@permission_object.permissions.where(:user_id=>user.id).collect {|p|
"#{user.id},#{p.role.id}"}), :id =>
"user_role_selected_#{user.id}"
diff --git a/src/app/views/permissions/_permissions.html.haml
b/src/app/views/permissions/_permissions.html.haml
index f412570..dec5af7 100644
--- a/src/app/views/permissions/_permissions.html.haml
+++ b/src/app/views/permissions/_permissions.html.haml
@@ -23,9 +23,9 @@
%td= permission.user.last_name
%td= permission.user.first_name
- if check_privilege(Privilege::PERM_SET)
- %td= select_tag "permission_role_selected[]",
options_for_select((a)roles.map {|r| [ r.name, "#{permission.id},#{r.id}" ] },
:selected => "#{permission.id},#{permission.role.id}", :disabled =>
@permission_object.permissions.where(["user_id = ? and role_id != ?",
permission.user_id, permission.role_id]).collect {|p|
"#{permission.id},#{p.role.id}"}), :id =>
"permission_role_selected_#{permission.id}"
+ %td= select_tag "permission_role_selected[]",
options_for_select((a)roles.map {|r| [ t(r.name, :scope=> :role_defs, :default =>
r.name), "#{permission.id},#{r.id}" ] }, :selected =>
"#{permission.id},#{permission.role.id}", :disabled =>
@permission_object.permissions.where(["user_id = ? and role_id != ?",
permission.user_id, permission.role_id]).collect {|p|
"#{permission.id},#{p.role.id}"}), :id =>
"permission_role_selected_#{permission.id}"
:javascript
$("#permission_role_selected_#{permission.id}").change(function () {
$("#perm_edit_button").click(); } );
-else
- %td= permission.role.name
+ %td= t(permission.role.name, :scope=> :role_defs, :default =>
permission.role.name)
diff --git a/src/config/locales/role_definitions/en.yml
b/src/config/locales/role_definitions/en.yml
new file mode 100644
index 0000000..8563db6
--- /dev/null
+++ b/src/config/locales/role_definitions/en.yml
@@ -0,0 +1,50 @@
+en:
+ role_defs:
+ base:
+ admin: Global Administrator
+ catalog:
+ user: Global Catalog User
+ deployable:
+ admin: Global Deployable Administrator
+ user: Global Deployable User
+ hwp:
+ admin: Global HWP Administrator
+ user: Global HWP User
+ image:
+ admin: Global Image Administrator
+ pool:
+ admin: Global Pool Administrator
+ creator: Global Pool Creator
+ user: Global Pool User
+ provider:
+ admin: Global Provider Administrator
+ creator: Global Provider Creator
+ realm:
+ admin: Global Realm Administrator
+ catalog:
+ admin: Catalog Administrator
+ user: Catalog User
+ deployable:
+ owner: Deployable Owner
+ user: Deployable User
+ deployment:
+ owner: Deployment Owner
+ user: Deployment User
+ instance:
+ owner: Instance Owner
+ user: Instance User
+ pool:
+ admin: Pool Administrator
+ deployable:
+ admin: Pool Deployable Admin
+ user: Pool User
+ pool_family:
+ admin: Pool Family Administrator
+ image:
+ admin: Pool Family Image Administrator
+ user: Pool Family User
+ provider:
+ admin: Provider Administrator
+ provider_account:
+ owner: Provider Account Owner
+ user: Provider Account User
diff --git
a/src/db/migrate/20110913150708_add_view_hardware_profile_privileges_to_admins.rb
b/src/db/migrate/20110913150708_add_view_hardware_profile_privileges_to_admins.rb
index a3149d9..7b7f20d 100644
--- a/src/db/migrate/20110913150708_add_view_hardware_profile_privileges_to_admins.rb
+++ b/src/db/migrate/20110913150708_add_view_hardware_profile_privileges_to_admins.rb
@@ -19,7 +19,7 @@ class AddViewHardwareProfilePrivilegesToAdmins <
ActiveRecord::Migration
return if Role.all.empty?
Role.transaction do
- ["HWP Administrator", "Administrator"].each do |role_name|
+ ["base.hwp.admin", "base.admin"].each do |role_name|
role = Role.find_or_initialize_by_name(role_name)
priv_type = HardwareProfile
diff --git a/src/db/seeds.rb b/src/db/seeds.rb
index 954b670..09a588b 100644
--- a/src/db/seeds.rb
+++ b/src/db/seeds.rb
@@ -16,7 +16,6 @@
# Default Pool Family
PoolFamily.create!(:name => "default", :description => "default pool
family", :quota => Quota.create)
-
# Default Pool
Pool.create!(:name => "Default", :quota => Quota.create, :pool_family
=> PoolFamily.find_by_name('default'), :enabled => true)
@@ -33,72 +32,72 @@ GPRM = "set_perms"
roles =
{Instance =>
- {"Instance Controller" => [false, {Instance => [VIEW,USE]}],
- "Instance Owner" => [true, {Instance => [VIEW,USE,MOD,
VPRM,GPRM]}]},
+ {"instance.user" => [false, {Instance =>
[VIEW,USE]}],
+ "instance.owner" => [true, {Instance =>
[VIEW,USE,MOD, VPRM,GPRM]}]},
Deployment =>
- {"Deployment Controller" => [false, {Deployment => [VIEW,USE],
- Instance => [VIEW]}],
- "Deployment Owner" => [true, {Deployment => [VIEW,USE,MOD,
VPRM,GPRM],
- Instance => [VIEW,USE,MOD]}]},
+ {"deployment.user" => [false, {Deployment =>
[VIEW,USE],
+ Instance
=> [VIEW]}],
+ "deployment.owner" => [true, {Deployment =>
[VIEW,USE,MOD, VPRM,GPRM],
+ Instance => [VIEW,USE,MOD]}]},
PoolFamily =>
- {"Pool Family User" => [false, {Pool => [VIEW]}],
- "Pool Family Owner" => [true, {PoolFamily => [VIEW, MOD,
VPRM,GPRM],
- Pool => [VIEW,
MOD,CRE,VPRM,GPRM]}]},
+ {"pool_family.user" => [false, {Pool =>
[VIEW]}],
+ "pool_family.admin" => [true, {PoolFamily => [VIEW,
MOD, VPRM,GPRM],
+ Pool
=> [VIEW, MOD,CRE,VPRM,GPRM]}]},
Pool =>
- {"Pool User" => [false, {Pool => [VIEW],
- Instance => [ CRE],
- Deployment => [ CRE],
- Quota => [VIEW]}],
- "Pool Owner" => [true, {Pool => [VIEW, MOD,
VPRM,GPRM],
- Instance => [VIEW,USE,MOD,CRE],
- Deployment => [VIEW,USE,MOD,CRE],
- Quota => [VIEW]}]},
+ {"pool.user" => [false, {Pool => [VIEW],
+ Instance
=> [ CRE],
+ Deployment
=> [ CRE],
+ Quota
=> [VIEW]}],
+ "pool.admin" => [true, {Pool => [VIEW,
MOD, VPRM,GPRM],
+ Instance
=> [VIEW,USE,MOD,CRE],
+ Deployment
=> [VIEW,USE,MOD,CRE],
+ Quota
=> [VIEW]}]},
Provider =>
- {"Provider Owner" => [true, {Provider => [VIEW, MOD,
VPRM,GPRM],
- ProviderAccount =>
[VIEW,USE,MOD,CRE,VPRM,GPRM]}]},
+ {"provider.admin" => [true, {Provider => [VIEW,
MOD, VPRM,GPRM],
+ ProviderAccount =>
[VIEW,USE,MOD,CRE,VPRM,GPRM]}]},
ProviderAccount =>
- {"Provider Account User" => [false, {ProviderAccount =>
[VIEW,USE]}],
- "Provider Account Owner" => [true, {ProviderAccount =>
[VIEW,USE,MOD, VPRM,GPRM]}]},
+ {"provider_account.user" => [false, {ProviderAccount =>
[VIEW,USE]}],
+ "provider_account.owner" => [true, {ProviderAccount =>
[VIEW,USE,MOD, VPRM,GPRM]}]},
Catalog =>
- {"Catalog User" => [false, {Catalog => [VIEW, USE]}],
- "Catalog Administrator" => [true, {Catalog =>
[VIEW,USE,MOD,VPRM,GPRM]}]},
+ {"catalog.user" => [false, {Catalog => [VIEW,
USE]}],
+ "catalog.admin" => [true, {Catalog =>
[VIEW,USE,MOD,VPRM,GPRM]}]},
Deployable =>
- {"Deployable User" => [false, {Deployable =>
[VIEW,USE]}],
- "Deployable Owner" => [true, {Deployable =>
[VIEW,USE,MOD,VPRM,GPRM]}]},
+ {"deployable.user" => [false, {Deployable =>
[VIEW,USE]}],
+ "deployable.owner" => [true, {Deployable =>
[VIEW,USE,MOD,VPRM,GPRM]}]},
BasePermissionObject =>
- {"Provider Creator" => [false, {Provider => [
CRE]}],
- "Provider Administrator" => [false, {Provider => [VIEW,
MOD,CRE,VPRM,GPRM],
- ProviderAccount =>
[VIEW,USE,MOD,CRE,VPRM,GPRM]}],
- "HWP Administrator" => [false, {HardwareProfile => [VIEW,
MOD,CRE,VPRM,GPRM]}],
- "Realm Administrator" => [false, {Realm => [
USE,MOD,CRE,VPRM,GPRM]}],
- "Pool Creator" => [false, {Pool => [
CRE]}],
- "Pool Administrator" => [false, {Pool => [VIEW,
MOD,CRE,VPRM,GPRM],
- Instance =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
- Deployment =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
- Quota => [VIEW, MOD],
- PoolFamily => [VIEW,
MOD,CRE,VPRM,GPRM]}],
- "Deployable Administrator" => [false, {Deployable =>
[VIEW,USE,MOD,CRE,VPRM,GPRM]}],
- "Deployable Global User" => [false, {Deployable=> [VIEW,USE]}],
- "Catalog Global User" => [false, {Catalog => [VIEW,USE]}],
- "HWP Global User" => [false, {HardwareProfile => [VIEW,USE]}],
- "Pool Global User" => [false, {Pool =>
[VIEW],
- Instance => [
CRE],
- Deployment => [
CRE],
- Quota => [VIEW]}],
- "Image Administrator" => [false, {PoolFamily => [VIEW, USE]
}],
- "Administrator" => [false, {Provider => [VIEW,
MOD,CRE,VPRM,GPRM],
- ProviderAccount =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
- HardwareProfile => [VIEW,
MOD,CRE,VPRM,GPRM],
- Realm => [
USE,MOD,CRE,VPRM,GPRM],
- User => [VIEW, MOD,CRE],
- Pool => [VIEW,
MOD,CRE,VPRM,GPRM],
- Instance =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
- Deployment =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
- Quota => [VIEW, MOD],
- PoolFamily =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
- Catalog =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
- Deployable =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
- BasePermissionObject => [ MOD,
VPRM,GPRM]}]}}
+ {"base.provider.creator" => [false, {Provider => [
CRE]}],
+ "base.provider.admin" => [false, {Provider => [VIEW,
MOD,CRE,VPRM,GPRM],
+ ProviderAccount =>
[VIEW,USE,MOD,CRE,VPRM,GPRM]}],
+ "base.hwp.admin" => [false, {HardwareProfile => [VIEW,
MOD,CRE,VPRM,GPRM]}],
+ "base.realm.admin" => [false, {Realm => [
USE,MOD,CRE,VPRM,GPRM]}],
+ "base.pool.creator" => [false, {Pool => [
CRE]}],
+ "base.pool.admin" => [false, {Pool => [VIEW,
MOD,CRE,VPRM,GPRM],
+ Instance =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
+ Deployment =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
+ Quota => [VIEW, MOD],
+ PoolFamily => [VIEW,
MOD,CRE,VPRM,GPRM]}],
+ "base.deployable.admin" => [false, {Deployable =>
[VIEW,USE,MOD,CRE,VPRM,GPRM]}],
+ "base.deployable.user" => [false, {Deployable=> [VIEW,USE]}],
+ "base.catalog.user" => [false, {Catalog => [VIEW,USE]}],
+ "base.hwp.user" => [false, {HardwareProfile =>
[VIEW,USE]}],
+ "base.pool.user" => [false, {Pool => [VIEW],
+ Instance => [ CRE],
+ Deployment => [ CRE],
+ Quota => [VIEW]}],
+ "base.image.admin" => [false, {PoolFamily => [VIEW,
USE] }],
+ "base.admin" => [false, {Provider => [VIEW,
MOD,CRE,VPRM,GPRM],
+ ProviderAccount =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
+ HardwareProfile => [VIEW,
MOD,CRE,VPRM,GPRM],
+ Realm => [
USE,MOD,CRE,VPRM,GPRM],
+ User => [VIEW, MOD,CRE],
+ Pool => [VIEW,
MOD,CRE,VPRM,GPRM],
+ Instance =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
+ Deployment =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
+ Quota => [VIEW, MOD],
+ PoolFamily =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
+ Catalog =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
+ Deployable =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
+ BasePermissionObject => [ MOD,
VPRM,GPRM]}]}}
Role.transaction do
roles.each do |role_scope, scoped_hash|
scoped_hash.each do |role_name, role_def|
@@ -122,11 +121,11 @@ MetadataObject.set("default_pool_family",
PoolFamily.find_by_name('default'))
default_quota = Quota.create
default_pool = Pool.find_by_name("Default")
-default_role = Role.find_by_name("Pool User")
-default_deployable_role = Role.find_by_name("Deployable Global User")
-default_pool_global_user_role = Role.find_by_name("Pool Global User")
-default_catalog_global_user_role = Role.find_by_name("Catalog Global User")
-default_hwp_global_user_role = Role.find_by_name("HWP Global User")
+default_role = Role.find_by_name("pool.user")
+default_deployable_role = Role.find_by_name("base.deployable.user")
+default_pool_global_user_role = Role.find_by_name("base.pool.user")
+default_catalog_global_user_role = Role.find_by_name("base.catalog.user")
+default_hwp_global_user_role = Role.find_by_name("base.hwp.user")
settings = {"allow_self_service_logins" => "true",
"self_service_default_quota" => default_quota,
diff --git a/src/features/permission.feature b/src/features/permission.feature
index 33006d2..abdd5ab 100644
--- a/src/features/permission.feature
+++ b/src/features/permission.feature
@@ -29,7 +29,7 @@ Feature: Manage Permissions
When I follow "Grant Access"
Then I should be on the new permission page
And I should see "Choose roles for users"
- When I select "Pool Owner" role for the user "testuser"
+ When I select "Pool Admin" role for the user "testuser"
And I press "Grant Access"
Then I should be on the page for the pool "PermissionPool"
And I should see "Added the following User Roles"
diff --git a/src/lib/tasks/dc_tasks.rake b/src/lib/tasks/dc_tasks.rake
index 3731712..b83cc6d 100644
--- a/src/lib/tasks/dc_tasks.rake
+++ b/src/lib/tasks/dc_tasks.rake
@@ -69,11 +69,11 @@ namespace :dc do
exit(1)
end
- unless user.permissions.select { |p| p.role.name.eql?('Administrator')
}.empty?
+ unless user.permissions.select { |p| p.role.name.eql?('base.admin') }.empty?
puts "Permission already granted for user #{args.login}"
exit(1)
end
- permission = Permission.new(:role => Role.find_by_name('Administrator'),
+ permission = Permission.new(:role => Role.find_by_name('base.admin'),
:permission_object =>
BasePermissionObject.general_permission_scope,
:user => user)
if permission.save
diff --git a/src/spec/controllers/config_servers_controller_spec.rb
b/src/spec/controllers/config_servers_controller_spec.rb
index 288c50c..53b89df 100644
--- a/src/spec/controllers/config_servers_controller_spec.rb
+++ b/src/spec/controllers/config_servers_controller_spec.rb
@@ -26,7 +26,7 @@ describe ConfigServersController do
before(:each) do
@config_server = Factory :mock_config_server
@provider_account = @config_server.provider_account
- @admin_permission = Permission.create :role => Role.find(:first, :conditions
=> ['name = ?', 'Provider Administrator']),
+ @admin_permission = Permission.create :role => Role.find(:first, :conditions
=> ['name = ?', 'base.provider.admin']),
:permission_object =>
@provider_account.provider,
:user =>
FactoryGirl.create(:provider_admin_user)
@admin = @admin_permission.user
@@ -49,7 +49,7 @@ describe ConfigServersController do
context "creating config servers" do
before(:each) do
@provider_account = Factory :mock_provider_account
- @admin_permission = Permission.create :role => Role.find(:first, :conditions
=> ['name = ?', 'Provider Administrator']),
+ @admin_permission = Permission.create :role => Role.find(:first, :conditions
=> ['name = ?', 'base.provider.admin']),
:permission_object =>
@provider_account.provider,
:user =>
FactoryGirl.create(:provider_admin_user)
@admin = @admin_permission.user
diff --git a/src/spec/controllers/provider_accounts_controller_spec.rb
b/src/spec/controllers/provider_accounts_controller_spec.rb
index 0b722c9..a875938 100644
--- a/src/spec/controllers/provider_accounts_controller_spec.rb
+++ b/src/spec/controllers/provider_accounts_controller_spec.rb
@@ -24,7 +24,7 @@ describe ProviderAccountsController do
@provider_account = FactoryGirl.create :mock_provider_account
@provider = @provider_account.provider
- @admin_permission = Permission.create :role => Role.find(:first, :conditions =>
['name = ?', 'Provider Administrator']),
+ @admin_permission = Permission.create :role => Role.find(:first, :conditions =>
['name = ?', 'base.provider.admin']),
:permission_object => @provider,
:user =>
FactoryGirl.create(:provider_admin_user)
@admin = @admin_permission.user
diff --git a/src/spec/factories/permission.rb b/src/spec/factories/permission.rb
index 1a1f025..41c331a 100644
--- a/src/spec/factories/permission.rb
+++ b/src/spec/factories/permission.rb
@@ -21,37 +21,37 @@ FactoryGirl.define do
end
factory :admin_permission, :parent => :permission do
- role { |r| Role.first(:conditions => ['name = ?',
'Administrator']) || FactoryGirl.create(:role, :name =>
'Administrator') }
+ role { |r| Role.first(:conditions => ['name = ?', 'base.admin'])
|| FactoryGirl.create(:role, :name => 'base.admin') }
permission_object { |r| BasePermissionObject.general_permission_scope }
user { |r| r.association(:admin_user) }
end
factory :provider_admin_permission, :parent => :permission do
- role { |r| Role.first(:conditions => ['name = ?', 'Provider
Administrator']) || FactoryGirl.create(:role, :name => 'Provider
Administrator') }
+ role { |r| Role.first(:conditions => ['name = ?',
'base.provider.admin']) || FactoryGirl.create(:role, :name =>
'base.provider.admin') }
permission_object { |r| r.association(:mock_provider) }
user { |r| r.association(:provider_admin_user) }
end
factory :pool_creator_permission, :parent => :permission do
- role { |r| Role.first(:conditions => ['name = ?', 'Pool Creator'])
|| FactoryGirl.create(:role, :name => 'Pool Creator') }
+ role { |r| Role.first(:conditions => ['name = ?',
'base.pool.creator']) || FactoryGirl.create(:role, :name =>
'base.pool.creator') }
permission_object { |r| BasePermissionObject.general_permission_scope }
user { |r| r.association(:pool_creator_user) }
end
factory :pool_user_permission, :parent => :permission do
- role { |r| Role.first(:conditions => ['name = ?', 'Pool User']) ||
FactoryGirl.create(:role, :name => 'Pool User') }
+ role { |r| Role.first(:conditions => ['name = ?', 'pool.user']) ||
FactoryGirl.create(:role, :name => 'pool.user') }
permission_object { |r| r.association(:pool) }
user { |r| r.association(:pool_user) }
end
factory :pool_user2_permission, :parent => :permission do
- role { |r| Role.first(:conditions => ['name = ?', 'Pool User']) ||
FactoryGirl.create(:role, :name => 'Pool User') }
+ role { |r| Role.first(:conditions => ['name = ?', 'pool.user']) ||
FactoryGirl.create(:role, :name => 'pool.user') }
permission_object { |r| r.association(:pool) }
user { |r| r.association(:pool_user2) }
end
factory :pool_family_user_permission, :parent => :permission do
- role { |r| Role.first(:conditions => ['name = ?', 'Pool Family
User']) || FactoryGirl.create(:role, :name => 'Pool Family User') }
+ role { |r| Role.first(:conditions => ['name = ?',
'pool_family.user']) || FactoryGirl.create(:role, :name =>
'pool_family.user') }
permission_object { |r| r.association(:pool_family) }
user { |r| r.association(:pool_family_user) }
end
--
1.7.7.6