Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

changed function name from permission_grand to permission_grant in Role model

Browse source
This commit is contained in:
Johannes Nickel 2017-02-24 14:47:55 +01:00
parent 8d4fd8b614
commit 0c97b9a401
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/role.rb
View file

@ -19,13 +19,13 @@ class Role < ApplicationModel
=begin
grand permission to role
grant permission to role
role.permission_grand('permission.key')
role.permission_grant('permission.key')
=end
def permission_grand(key)
def permission_grant(key)
permission = Permission.lookup(name: key)
raise "Invalid permission #{key}" if !permission
return true if permission_ids.include?(permission.id)

24
db/seeds.rb
View file

@ -3115,22 +3115,22 @@ Permission.create_if_not_exists(
)
admin = Role.find_by(name: 'Admin')
admin.permission_grand('user_preferences')
admin.permission_grand('admin')
admin.permission_grand('report')
admin.permission_grant('user_preferences')
admin.permission_grant('admin')
admin.permission_grant('report')
agent = Role.find_by(name: 'Agent')
agent.permission_grand('user_preferences')
agent.permission_grand('ticket.agent')
agent.permission_grand('chat.agent')
agent.permission_grand('cti.agent')
agent.permission_grant('user_preferences')
agent.permission_grant('ticket.agent')
agent.permission_grant('chat.agent')
agent.permission_grant('cti.agent')
customer = Role.find_by(name: 'Customer')
customer.permission_grand('user_preferences.password')
customer.permission_grand('user_preferences.language')
customer.permission_grand('user_preferences.linked_accounts')
customer.permission_grand('user_preferences.avatar')
customer.permission_grand('ticket.customer')
customer.permission_grant('user_preferences.password')
customer.permission_grant('user_preferences.language')
customer.permission_grant('user_preferences.linked_accounts')
customer.permission_grant('user_preferences.avatar')
customer.permission_grant('ticket.customer')
Group.create_if_not_exists(
id: 1,

2
test/controllers/settings_controller_test.rb
View file

@ -33,7 +33,7 @@ class SettingsControllerTest < ActionDispatch::IntegrationTest
updated_by_id: 1,
created_by_id: 1
)
role_api.permission_grand('admin.api')
role_api.permission_grant('admin.api')
@admin_api = User.create_or_update(
login: 'setting-admin-api',
firstname: 'Setting',

8
test/unit/permission_test.rb
View file

@ -35,7 +35,7 @@ class PermissionTest < ActiveSupport::TestCase
created_by_id: 1,
)
role_permission1.permission_revoke('admin')
role_permission1.permission_grand('admin.permission1')
role_permission1.permission_grant('admin.permission1')
user_with_permission1 = User.create_or_update(
login: 'setting-permission1',
firstname: 'Setting',
@ -63,7 +63,7 @@ class PermissionTest < ActiveSupport::TestCase
assert_equal(false, user_with_permission1.permissions?('admin.permission2'))
assert_equal(false, user_with_permission1.permissions?('admin'))
role_permission1.permission_grand('admin')
role_permission1.permission_grant('admin')
assert_equal(false, user_with_permission1.permissions?('admin.permission1'))
assert_equal(true, user_with_permission1.permissions?('admin.*'))
@ -94,7 +94,7 @@ class PermissionTest < ActiveSupport::TestCase
updated_by_id: 1,
created_by_id: 1,
)
role_permission3.permission_grand('admin.permission3')
role_permission3.permission_grant('admin.permission3')
user_with_permission3 = User.create_or_update(
login: 'setting-permission3',
firstname: 'Setting',
@ -147,7 +147,7 @@ class PermissionTest < ActiveSupport::TestCase
updated_by_id: 1,
created_by_id: 1,
)
role_permission1.permission_grand('admin')
role_permission1.permission_grant('admin')
user_with_permission1 = User.create_or_update(
login: 'setting-permission-child1',
firstname: 'Setting',