usman 0.4.3.pre.materialize → 0.4.4.pre.materialize

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/helpers/usman/authentication_helper.rb +0 -1
  3. data/app/models/user.rb +13 -4
  4. data/app/views/usman/sessions/_permission_denied.js.erb +3 -3
  5. data/lib/usman/version.rb +1 -1
  6. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c6a54b37cdb9a68ca3405552551eddae618469198a8041ca0f6f52d73f884b6a
4
- data.tar.gz: c1440ec4330c01d8bb2ec777417a74b4937974236e024d3c76aaab9be4316e98
3
+ metadata.gz: 518e591d30fac70f5b49c2b121dde55c2a37b95101abde284970900ef732a894
4
+ data.tar.gz: efd87d98b94251613b865763761c428cb9eb64748376d2f8c4dd81958b9ca31d
5
5
  SHA512:
6
- metadata.gz: 72665559fa06c41b0a8a753296fc05477fc29dfa1abad57cf3d46c37c0051a56e7f36ba4bc0e2d3644bb35677b8cbd1fd314127b62efa19a798797475533a573
7
- data.tar.gz: 93c97d8f55530a1da1cdb3b634b0572f6643228abd04cd4d27cdb2533db1698395eaabfe5ed0a2c66b37ba3c05af0530e1b1738c5ea2bf63a6245e447527363e
6
+ metadata.gz: 7529ce9031867f93438c10d50e8f857bca24640233601d3f92a332ba22fa2401f201db3b102de23052746461f2587eab373daea10ac9d5a110c39d98dbf121d4
7
+ data.tar.gz: 10c28ef09bb3ee6cbc1bac572be717b21eefd31750be079b66f85c542fdd6329b610752247f8f2284777b9d6667ff18539b37b932c73caab71412465f2120673
data/app/helpers/usman/authentication_helper.rb CHANGED
@@ -17,7 +17,6 @@ module Usman
17
17
  def permission_denied
18
18
  file_path = "layouts/kuppayam/#{@current_layout}/401"
19
19
  layout_path = "layouts/kuppayam/#{@current_layout}/blank_with_nav"
20
-
21
20
  render :file => file_path, layout: layout_path, :status => :unauthorized
22
21
  end
23
22
 
data/app/models/user.rb CHANGED
@@ -449,13 +449,22 @@ class User < Usman::ApplicationRecord
449
449
  end
450
450
 
451
451
  def has_role?(role)
452
- role = Role.find_by_name(role) if role.is_a?(String)
453
- if role && role.persisted?
454
- return true if self.super_admin
455
- self.roles.exists?(:id => [role.id])
452
+ return true if self.super_admin
453
+
454
+ case role
455
+
456
+ when String
457
+ self.roles.where(name: role).count > 0
458
+ when Integer
459
+ self.roles.where(id: role).count > 0
460
+ when Array
461
+ self.roles.where(name: role).count > 0
462
+ when Role
463
+ self.roles.where(id: role.id).count > 0
456
464
  else
457
465
  return false
458
466
  end
467
+
459
468
  end
460
469
 
461
470
  # Permission Methods
data/app/views/usman/sessions/_permission_denied.js.erb CHANGED
@@ -1,3 +1,3 @@
1
- var heading = "Permission Denied";
2
- var bodyContent = "Permission Denied";
3
- showGenericModal(heading, bodyContent);
1
+ var heading = "Access Denied";
2
+ var bodyContent = "<%= escape_javascript(render(:partial=>'/layouts/kuppayam/materialize/permission_denied', locals: {show_popup_close_button: true})) %>";
3
+ showGenericModal(heading, bodyContent, true);
data/lib/usman/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Usman
2
- VERSION = '0.4.3.pre.materialize'
2
+ VERSION = '0.4.4.pre.materialize'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: usman
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.3.pre.materialize
4
+ version: 0.4.4.pre.materialize
5
5
  platform: ruby
6
6
  authors:
7
7
  - kpvarma
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-21 00:00:00.000000000 Z
11
+ date: 2018-04-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -104,28 +104,28 @@ dependencies:
104
104
  requirements:
105
105
  - - ">="
106
106
  - !ruby/object:Gem::Version
107
- version: 0.2.3.pre.materialize
107
+ version: 0.2.6.pre.materialize
108
108
  type: :runtime
109
109
  prerelease: false
110
110
  version_requirements: !ruby/object:Gem::Requirement
111
111
  requirements:
112
112
  - - ">="
113
113
  - !ruby/object:Gem::Version
114
- version: 0.2.3.pre.materialize
114
+ version: 0.2.6.pre.materialize
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: pattana
117
117
  requirement: !ruby/object:Gem::Requirement
118
118
  requirements:
119
119
  - - ">="
120
120
  - !ruby/object:Gem::Version
121
- version: 0.2.3.pre.materialize
121
+ version: 0.2.4.pre.materialize
122
122
  type: :runtime
123
123
  prerelease: false
124
124
  version_requirements: !ruby/object:Gem::Requirement
125
125
  requirements:
126
126
  - - ">="
127
127
  - !ruby/object:Gem::Version
128
- version: 0.2.3.pre.materialize
128
+ version: 0.2.4.pre.materialize
129
129
  - !ruby/object:Gem::Dependency
130
130
  name: bcrypt
131
131
  requirement: !ruby/object:Gem::Requirement