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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6a54b37cdb9a68ca3405552551eddae618469198a8041ca0f6f52d73f884b6a
-  data.tar.gz: c1440ec4330c01d8bb2ec777417a74b4937974236e024d3c76aaab9be4316e98
+  metadata.gz: 518e591d30fac70f5b49c2b121dde55c2a37b95101abde284970900ef732a894
+  data.tar.gz: efd87d98b94251613b865763761c428cb9eb64748376d2f8c4dd81958b9ca31d
 SHA512:
-  metadata.gz: 72665559fa06c41b0a8a753296fc05477fc29dfa1abad57cf3d46c37c0051a56e7f36ba4bc0e2d3644bb35677b8cbd1fd314127b62efa19a798797475533a573
-  data.tar.gz: 93c97d8f55530a1da1cdb3b634b0572f6643228abd04cd4d27cdb2533db1698395eaabfe5ed0a2c66b37ba3c05af0530e1b1738c5ea2bf63a6245e447527363e
+  metadata.gz: 7529ce9031867f93438c10d50e8f857bca24640233601d3f92a332ba22fa2401f201db3b102de23052746461f2587eab373daea10ac9d5a110c39d98dbf121d4
+  data.tar.gz: 10c28ef09bb3ee6cbc1bac572be717b21eefd31750be079b66f85c542fdd6329b610752247f8f2284777b9d6667ff18539b37b932c73caab71412465f2120673

data/app/helpers/usman/authentication_helper.rb

@@ -17,7 +17,6 @@ module Usman
     def permission_denied
       file_path = "layouts/kuppayam/#{@current_layout}/401"
       layout_path = "layouts/kuppayam/#{@current_layout}/blank_with_nav"
-
       render :file => file_path, layout: layout_path, :status => :unauthorized
     end
     

data/app/models/user.rb

@@ -449,13 +449,22 @@ class User < Usman::ApplicationRecord
   end
 
   def has_role?(role)
-    role = Role.find_by_name(role) if role.is_a?(String)
-    if role && role.persisted?
-      return true if self.super_admin
-      self.roles.exists?(:id => [role.id])
+    return true if self.super_admin
+    
+    case role
+
+    when String
+      self.roles.where(name: role).count > 0
+    when Integer
+      self.roles.where(id: role).count > 0
+    when Array
+      self.roles.where(name: role).count > 0
+    when Role
+      self.roles.where(id: role.id).count > 0
     else
       return false
     end
+
   end
 
   # Permission Methods

data/app/views/usman/sessions/_permission_denied.js.erb

@@ -1,3 +1,3 @@
-var heading = "Permission Denied";
-var bodyContent = "Permission Denied";
-showGenericModal(heading, bodyContent);
+var heading = "Access Denied";
+var bodyContent = "<%= escape_javascript(render(:partial=>'/layouts/kuppayam/materialize/permission_denied', locals: {show_popup_close_button: true})) %>";
+showGenericModal(heading, bodyContent, true);

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.4.3.pre.materialize'
+  VERSION = '0.4.4.pre.materialize'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.4.3.pre.materialize
+  version: 0.4.4.pre.materialize
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-21 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,28 +104,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3.pre.materialize
+        version: 0.2.6.pre.materialize
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3.pre.materialize
+        version: 0.2.6.pre.materialize
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3.pre.materialize
+        version: 0.2.4.pre.materialize
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3.pre.materialize
+        version: 0.2.4.pre.materialize
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement