usman 0.3.10 → 0.3.11

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 (4) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/user.rb +8 -4
  3. data/lib/usman/version.rb +1 -1
  4. metadata +12 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 247fe28d994f29a5dae5161aab173588e3eabe02
4
- data.tar.gz: 4eda2b63f0f9557cddd4a4eb4348a2f78949c8ff
3
+ metadata.gz: 0b7935d6c503df0f8be49f55b1c9b34a2f7ec6d2
4
+ data.tar.gz: 86710938de40c6ca064ec9d7336f2e4c51eef461
5
5
  SHA512:
6
- metadata.gz: 13734dfb988c4ee34a328eab1ea00595d658ac7138adeecb6992fd0b186779e523d6899702d4a34f5c4fdf7e04ae88f572436ce4dbe9127aad224a326e8d9266
7
- data.tar.gz: 2c6a701c84c9d4f2d805a78982ff94b0c3619e5097bdd091434adc6c513dc94b7d20c91ddd121aba3277c04351c6e23764bc979006a8d563f971fe3ac6206a93
6
+ metadata.gz: 82ee60589639762946614f98ce425768b5f4e0d58526a8e10689fcf16bd12447501bd443b933c3da1ce1581fc3e48f61b112727dcf30b23d8a24324d0ae24407
7
+ data.tar.gz: 7ab6dd0a943515c587aefb806478d7fb46e6b962185c32926b274d045802c13713adfac9edcff92afcbe9063e9574d6d90d104b9f7458f8a8c2917509a710190
data/app/models/user.rb CHANGED
@@ -101,6 +101,10 @@ class User < Usman::ApplicationRecord
101
101
  scope :super_admins, -> { where(super_admin: TRUE) }
102
102
  scope :normal_users, -> { where(super_admin: FALSE) }
103
103
 
104
+ # Need to write a scope so that we have one for showing only site admins
105
+ # Also need to restrict the removal of site admin to super admin
106
+ # scope :site_admins, -> { joins().where(super_admin: FALSE) }
107
+
104
108
  # Import Methods
105
109
 
106
110
  def self.save_row_data(hsh)
@@ -379,7 +383,7 @@ class User < Usman::ApplicationRecord
379
383
  return true if self.super_admin
380
384
  feature = Feature.published.find_by_name(class_name.to_s)
381
385
  if feature
382
- permission = Permission.where("feature_id =?", feature.id).first
386
+ permission = self.permissions.where("feature_id =?", feature.id).first
383
387
  return permission && permission.can_read?
384
388
  else
385
389
  return false
@@ -390,7 +394,7 @@ class User < Usman::ApplicationRecord
390
394
  return true if self.super_admin
391
395
  feature = Feature.published.find_by_name(class_name.to_s)
392
396
  if feature
393
- permission = Permission.where("feature_id =?", feature.id).first
397
+ permission = self.permissions.where("feature_id =?", feature.id).first
394
398
  return permission && permission.can_create?
395
399
  else
396
400
  return false
@@ -401,7 +405,7 @@ class User < Usman::ApplicationRecord
401
405
  return true if self.super_admin
402
406
  feature = Feature.published.find_by_name(class_name.to_s)
403
407
  if feature
404
- permission = Permission.where("feature_id =?", feature.id).first
408
+ permission = self.permissions.where("feature_id =?", feature.id).first
405
409
  return permission && permission.can_update?
406
410
  else
407
411
  return false
@@ -412,7 +416,7 @@ class User < Usman::ApplicationRecord
412
416
  return true if self.super_admin
413
417
  feature = Feature.published.find_by_name(class_name.to_s)
414
418
  if feature
415
- permission = Permission.where("feature_id =?", feature.id).first
419
+ permission = self.permissions.where("feature_id =?", feature.id).first
416
420
  return permission && permission.can_delete?
417
421
  else
418
422
  return false
data/lib/usman/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Usman
2
- VERSION = '0.3.10'
2
+ VERSION = '0.3.11'
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.3.10
4
+ version: 0.3.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - kpvarma
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-10-25 00:00:00.000000000 Z
11
+ date: 2017-10-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -107,7 +107,7 @@ dependencies:
107
107
  version: '0.1'
108
108
  - - ">="
109
109
  - !ruby/object:Gem::Version
110
- version: 0.1.16
110
+ version: 0.1.17
111
111
  type: :runtime
112
112
  prerelease: false
113
113
  version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
117
117
  version: '0.1'
118
118
  - - ">="
119
119
  - !ruby/object:Gem::Version
120
- version: 0.1.16
120
+ version: 0.1.17
121
121
  - !ruby/object:Gem::Dependency
122
122
  name: pattana
123
123
  requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
127
127
  version: '0.1'
128
128
  - - ">="
129
129
  - !ruby/object:Gem::Version
130
- version: 0.1.13
130
+ version: 0.1.14
131
131
  type: :runtime
132
132
  prerelease: false
133
133
  version_requirements: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
137
137
  version: '0.1'
138
138
  - - ">="
139
139
  - !ruby/object:Gem::Version
140
- version: 0.1.13
140
+ version: 0.1.14
141
141
  - !ruby/object:Gem::Dependency
142
142
  name: bcrypt
143
143
  requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,9 @@ dependencies:
171
171
  requirement: !ruby/object:Gem::Requirement
172
172
  requirements:
173
173
  - - "~>"
174
+ - !ruby/object:Gem::Version
175
+ version: '1.1'
176
+ - - ">="
174
177
  - !ruby/object:Gem::Version
175
178
  version: 1.1.0
176
179
  type: :runtime
@@ -178,6 +181,9 @@ dependencies:
178
181
  version_requirements: !ruby/object:Gem::Requirement
179
182
  requirements:
180
183
  - - "~>"
184
+ - !ruby/object:Gem::Version
185
+ version: '1.1'
186
+ - - ">="
181
187
  - !ruby/object:Gem::Version
182
188
  version: 1.1.0
183
189
  - !ruby/object:Gem::Dependency