usman 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 247fe28d994f29a5dae5161aab173588e3eabe02
-  data.tar.gz: 4eda2b63f0f9557cddd4a4eb4348a2f78949c8ff
+  metadata.gz: 0b7935d6c503df0f8be49f55b1c9b34a2f7ec6d2
+  data.tar.gz: 86710938de40c6ca064ec9d7336f2e4c51eef461
 SHA512:
-  metadata.gz: 13734dfb988c4ee34a328eab1ea00595d658ac7138adeecb6992fd0b186779e523d6899702d4a34f5c4fdf7e04ae88f572436ce4dbe9127aad224a326e8d9266
-  data.tar.gz: 2c6a701c84c9d4f2d805a78982ff94b0c3619e5097bdd091434adc6c513dc94b7d20c91ddd121aba3277c04351c6e23764bc979006a8d563f971fe3ac6206a93
+  metadata.gz: 82ee60589639762946614f98ce425768b5f4e0d58526a8e10689fcf16bd12447501bd443b933c3da1ce1581fc3e48f61b112727dcf30b23d8a24324d0ae24407
+  data.tar.gz: 7ab6dd0a943515c587aefb806478d7fb46e6b962185c32926b274d045802c13713adfac9edcff92afcbe9063e9574d6d90d104b9f7458f8a8c2917509a710190

data/app/models/user.rb

@@ -101,6 +101,10 @@ class User < Usman::ApplicationRecord
   scope :super_admins, -> { where(super_admin: TRUE) }
   scope :normal_users, -> { where(super_admin: FALSE) }
 
+  # Need to write a scope so that we have one for showing only site admins
+  # Also need to restrict the removal of site admin to super admin
+  # scope :site_admins, -> { joins().where(super_admin: FALSE) }
+
   # Import Methods
 
   def self.save_row_data(hsh)
@@ -379,7 +383,7 @@ class User < Usman::ApplicationRecord
     return true if self.super_admin
     feature = Feature.published.find_by_name(class_name.to_s)
     if feature
-      permission = Permission.where("feature_id =?", feature.id).first
+      permission = self.permissions.where("feature_id =?", feature.id).first
       return permission && permission.can_read?
     else
       return false
@@ -390,7 +394,7 @@ class User < Usman::ApplicationRecord
     return true if self.super_admin
     feature = Feature.published.find_by_name(class_name.to_s)
     if feature
-      permission = Permission.where("feature_id =?", feature.id).first
+      permission = self.permissions.where("feature_id =?", feature.id).first
       return permission && permission.can_create?
     else
       return false
@@ -401,7 +405,7 @@ class User < Usman::ApplicationRecord
     return true if self.super_admin
     feature = Feature.published.find_by_name(class_name.to_s)
     if feature
-      permission = Permission.where("feature_id =?", feature.id).first
+      permission = self.permissions.where("feature_id =?", feature.id).first
       return permission && permission.can_update?
     else
       return false
@@ -412,7 +416,7 @@ class User < Usman::ApplicationRecord
     return true if self.super_admin
     feature = Feature.published.find_by_name(class_name.to_s)
     if feature
-      permission = Permission.where("feature_id =?", feature.id).first
+      permission = self.permissions.where("feature_id =?", feature.id).first
       return permission && permission.can_delete?
     else
       return false

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.3.10'
+  VERSION = '0.3.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,7 +107,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.16
+        version: 0.1.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.16
+        version: 0.1.17
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.1.14
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
@@ -178,6 +181,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency