ecm_rbac 1.0.0 → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/ecm/rbac/role.rb +3 -3
- data/app/models/ecm/rbac/role_permission.rb +5 -3
- data/app/models/ecm/rbac/user_role.rb +5 -2
- data/config/initializers/inject_user_concern.rb +6 -0
- data/config/locales/de.yml +24 -0
- data/config/locales/en.yml +54 -0
- data/lib/ecm/rbac/version.rb +1 -1
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 696bacc1b0dd1799b577487bb2c74ff765eb1f39
|
4
|
+
data.tar.gz: 7adf7dcd893a17b2f8acf30415c76760b11ee6e8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4774a3d21f04dafd94cc30c44e1038c26a3c73574d798de3208a2372e9d5ec05e7deb547cf9d46686658314d14908e89be7e2885aa82332b0bfa84978211e663
|
7
|
+
data.tar.gz: 481f896cf39216c1b001fc353752101626dd43e1b770ee612ddfe3e7b592b371c38ab73507b0d51b60f1bab706e63df626d2290f3d26865140c6921b7b8bf1b7
|
data/app/models/ecm/rbac/role.rb
CHANGED
@@ -6,12 +6,12 @@ module Ecm::Rbac
|
|
6
6
|
|
7
7
|
DEFAULTS = {
|
8
8
|
enabled_from: '01.01.1900 00:00:00',
|
9
|
-
enabled_to:
|
9
|
+
enabled_to: '31.12.9999 23:59:59'
|
10
10
|
}
|
11
11
|
|
12
12
|
# associations
|
13
13
|
has_many :user_roles, class_name: 'Ecm::Rbac::UserRole', inverse_of: :role
|
14
|
-
has_many :users, through: :user_roles
|
14
|
+
has_many :users, through: :user_roles
|
15
15
|
|
16
16
|
has_many :role_permissions, class_name: 'Ecm::Rbac::RolePermission'
|
17
17
|
has_many :permissions, class_name: 'Ecm::Rbac::Permission', through: :role_permissions
|
@@ -37,7 +37,7 @@ module Ecm::Rbac
|
|
37
37
|
def set_defaults
|
38
38
|
return if persisted?
|
39
39
|
self.enabled_from = DEFAULTS[:enabled_from]
|
40
|
-
self.enabled_to
|
40
|
+
self.enabled_to = DEFAULTS[:enabled_to]
|
41
41
|
end
|
42
42
|
end
|
43
43
|
end
|
@@ -6,9 +6,11 @@ module Ecm::Rbac
|
|
6
6
|
has_many :user_roles, through: :role
|
7
7
|
has_many :users, through: :user_roles
|
8
8
|
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
if Rails.version >= '5.0.0'
|
10
|
+
belongs_to :enabled_role, -> { enabled }, foreign_key: 'role_id', class_name: 'Ecm::Rbac::Role', optional: true
|
11
|
+
else
|
12
|
+
belongs_to :enabled_role, -> { enabled }, foreign_key: 'role_id', class_name: 'Ecm::Rbac::Role'
|
13
|
+
end
|
12
14
|
has_many :enabled_user_roles, through: :enabled_role, source: :user_roles
|
13
15
|
has_many :enabled_users, through: :enabled_user_roles, source: :enabled_role_permissions
|
14
16
|
|
@@ -2,10 +2,13 @@ module Ecm::Rbac
|
|
2
2
|
class UserRole < ActiveRecord::Base
|
3
3
|
# associations
|
4
4
|
belongs_to :user, class_name: Ecm::Rbac::Configuration.user_class_name, foreign_key: 'user_id', inverse_of: :user_roles
|
5
|
-
# belongs_to :enabled_user, foreign_key: 'user_id', class_name: 'User'
|
6
5
|
belongs_to :role, inverse_of: :user_roles
|
7
6
|
|
8
|
-
|
7
|
+
if Rails.version >= '5.0.0'
|
8
|
+
belongs_to :enabled_role, -> { enabled }, foreign_key: 'role_id', class_name: 'Ecm::Rbac::Role', optional: true
|
9
|
+
else
|
10
|
+
belongs_to :enabled_role, -> { enabled }, foreign_key: 'role_id', class_name: 'Ecm::Rbac::Role'
|
11
|
+
end
|
9
12
|
has_many :enabled_role_permissions, through: :enabled_role, source: :user_roles, class_name: 'Ecm::Rbac::RolePermission'
|
10
13
|
has_many :enabled_permissions, through: :enabled_role_permissions, class_name: 'Ecm::Rbac::Permission', source: :permission
|
11
14
|
|
data/config/locales/de.yml
CHANGED
@@ -2,6 +2,7 @@ de:
|
|
2
2
|
activerecord:
|
3
3
|
attributes:
|
4
4
|
ecm/rbac/permission:
|
5
|
+
id: ID
|
5
6
|
actions: Aktionen
|
6
7
|
created_at: Erstellt am
|
7
8
|
enabled?: Aktiv
|
@@ -10,6 +11,7 @@ de:
|
|
10
11
|
identifier: Bezeichner
|
11
12
|
updated_at: Aktualisiert am
|
12
13
|
ecm/rbac/role:
|
14
|
+
id: ID
|
13
15
|
actions: Aktionen
|
14
16
|
created_at: Erstellt am
|
15
17
|
enabled?: Aktiv
|
@@ -17,6 +19,22 @@ de:
|
|
17
19
|
enabled_to: Aktiv bis
|
18
20
|
identifier: Bezeichner
|
19
21
|
updated_at: Aktualisiert am
|
22
|
+
ecm/rbac/role_permission:
|
23
|
+
id: ID
|
24
|
+
role: Rolle
|
25
|
+
role_id: Rolle
|
26
|
+
permission: Berechtigung
|
27
|
+
permission_id: Berechtigung
|
28
|
+
created_at: Erstellt am
|
29
|
+
updated_at: Aktualisiert am
|
30
|
+
ecm/rbac/user_role:
|
31
|
+
id: ID
|
32
|
+
user: Benutzer
|
33
|
+
user_id: Benutzer
|
34
|
+
role: Rolle
|
35
|
+
role_id: Rolle
|
36
|
+
created_at: Erstellt am
|
37
|
+
updated_at: Aktualisiert am
|
20
38
|
models:
|
21
39
|
ecm/rbac/permission:
|
22
40
|
one: Berechtigung
|
@@ -24,6 +42,12 @@ de:
|
|
24
42
|
ecm/rbac/role:
|
25
43
|
one: Rolle
|
26
44
|
other: Rollen
|
45
|
+
ecm/rbac/role_permission:
|
46
|
+
one: Rollen-Berechtigung
|
47
|
+
other: Rollen-Berechtigungen
|
48
|
+
ecm/rbac/user_role:
|
49
|
+
one: Benutzer-Rolle
|
50
|
+
other: Benutzer-Rollen
|
27
51
|
classes:
|
28
52
|
ecm/rbac/import_default_permissions_service: "Dienst zum Einrichten von Berechtigungen"
|
29
53
|
routes:
|
@@ -0,0 +1,54 @@
|
|
1
|
+
en:
|
2
|
+
activerecord:
|
3
|
+
attributes:
|
4
|
+
ecm/rbac/permission:
|
5
|
+
id: ID
|
6
|
+
actions: Actions
|
7
|
+
created_at: Created at
|
8
|
+
enabled?: Active
|
9
|
+
enabled_from: Enabled from
|
10
|
+
enabled_to: Enabled to
|
11
|
+
identifier: Identifier
|
12
|
+
updated_at: Updated at
|
13
|
+
ecm/rbac/role:
|
14
|
+
id: ID
|
15
|
+
actions: Actions
|
16
|
+
created_at: Created at
|
17
|
+
enabled?: Active
|
18
|
+
enabled_from: Enabled from
|
19
|
+
enabled_to: Enabled to
|
20
|
+
identifier: Identifier
|
21
|
+
updated_at: Updated at
|
22
|
+
ecm/rbac/role_permission:
|
23
|
+
id: ID
|
24
|
+
role: Role
|
25
|
+
role_id: Role
|
26
|
+
permission: Permission
|
27
|
+
permission_id: Permission
|
28
|
+
created_at: Created at
|
29
|
+
updated_at: Updated at
|
30
|
+
ecm/rbac/user_role:
|
31
|
+
id: ID
|
32
|
+
user: User
|
33
|
+
user_id: User
|
34
|
+
role: Role
|
35
|
+
role_id: Role
|
36
|
+
created_at: Created at
|
37
|
+
updated_at: Updated at
|
38
|
+
models:
|
39
|
+
ecm/rbac/permission:
|
40
|
+
one: Permission
|
41
|
+
other: Permissions
|
42
|
+
ecm/rbac/role:
|
43
|
+
one: Role
|
44
|
+
other: Roles
|
45
|
+
ecm/rbac/role_permission:
|
46
|
+
one: Role Permission
|
47
|
+
other: Role Permissions
|
48
|
+
ecm/rbac/user_role:
|
49
|
+
one: User Role
|
50
|
+
other: User Roles
|
51
|
+
classes:
|
52
|
+
ecm/rbac/import_default_permissions_service: "Import default permissions service"
|
53
|
+
routes:
|
54
|
+
ecm_rbac_engine: rbac
|
data/lib/ecm/rbac/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ecm_rbac
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Roberto Vasquez Angel
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-03-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -46,7 +46,9 @@ files:
|
|
46
46
|
- app/models/ecm/rbac/user_role.rb
|
47
47
|
- app/services/ecm/rbac/import_default_permissions_service.rb
|
48
48
|
- app/views/layouts/ecm/rbac/application.html.erb
|
49
|
+
- config/initializers/inject_user_concern.rb
|
49
50
|
- config/locales/de.yml
|
51
|
+
- config/locales/en.yml
|
50
52
|
- config/routes.rb
|
51
53
|
- db/migrate/20160301103116_create_ecm_rbac_roles.rb
|
52
54
|
- db/migrate/20160301103202_create_ecm_rbac_user_roles.rb
|