thecore 1.4.8 → 1.4.10

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4600fe4f44c7075a60b7118b759278e305cab539
4
- data.tar.gz: 38636092254326d28dc90b3e139aa02f686cfbe9
3
+ metadata.gz: 89226b95672590a7bb4e37006bf9d309df3b977a
4
+ data.tar.gz: a3a6192e70e327554a52a8a2dbb7331cffdb8aaf
5
5
  SHA512:
6
- metadata.gz: ce80df2f81a9ab16281f8cf836cd2a28a0ffc1ff7bc61b5e0b615f1d00a3b5a1ac928d666c9e3ae9be36b76e02ee86ba41759d1900d61340792efeb9b2806495
7
- data.tar.gz: b786d380c39ea3d2e936425f417107223775fc28aaabf56eaaed785bbb23a7760628a35cfc6606bf3bf2820880142773850eb20d9b5b38e9a63b209daee778c6
6
+ metadata.gz: 4e8999c7b950a0b90355af8a2a9a58ff65670344bce215e2144a2b3f715a5fc521cfcffb540ea54b305a218902bf792aa285042720d10d5b67d2dfde4c9add8e
7
+ data.tar.gz: 125065f52f176d66b700320bbdf06963239cfe6c8338b57a095cbcbf56c11351797ee74283f1d9f4949b7740227ee442033e4614d13fa4c79f1239ed26499fd9
data/app/models/user.rb CHANGED
@@ -23,6 +23,8 @@ class User < ApplicationRecord
23
23
  validates :password, presence: true, on: :create
24
24
  validates :password_confirmation, presence: true, on: :create
25
25
 
26
+ validates :roles, presence: true, on: :create
27
+
26
28
  def self.paged(page_number)
27
29
  order(admin: :desc, username: :asc).page page_number
28
30
  end
@@ -54,7 +56,7 @@ class User < ApplicationRecord
54
56
  username
55
57
  end
56
58
 
57
- #serialize :roles, Array
59
+ # serialize :roles, Array if Settings.single_role_per_user == "f"
58
60
  def roles_enum
59
61
  # Do not EDIT below this line
60
62
  ROLES.each_with_index.map {|a,i| [I18n.t("roles.#{a.to_sym}"), (i+1).to_s]}
@@ -64,8 +66,20 @@ class User < ApplicationRecord
64
66
  # if user.has_role? :admin
65
67
 
66
68
  # for roles array stored in db... take each value, see if it matches the second column in the roles_enum array, if so, retu the 1st col of the enum as a uprcase,space_to_underscore,symbol .
67
- chosen_roles = self.roles.map { |r| r.blank? ? nil : ROLES[r.to_i - 1] }
68
- chosen_roles.compact.include? role
69
+ begin
70
+ # roles array (enum)
71
+ chosen_roles = self.roles.map { |r| r.blank? ? nil : ROLES[r.to_i - 1] }
72
+ chosen_roles.compact.include? role
73
+ rescue
74
+ # single role
75
+ # ROLES[self.roles.to_i - 1] == role
76
+ Rails.logger.debug "ROLES: #{self.roles.to_s}"
77
+ self.roles.to_s == role.to_s
78
+ end
79
+ end
80
+
81
+ def roles
82
+ ROLES[super.to_i - 1]
69
83
  end
70
84
 
71
85
  RailsAdmin.config do |config|
@@ -96,10 +110,18 @@ class User < ApplicationRecord
96
110
  field :roles, :enum do
97
111
  visible !ROLES.blank?
98
112
  pretty_value do # used in list view columns and show views, defaults to formatted_value for non-association fields
99
- value.map { |v| bindings[:object].roles_enum.rassoc(v)[0] rescue nil }.compact.join ", "
113
+ begin
114
+ value.map { |v| bindings[:object].roles_enum.rassoc(v)[0] rescue nil }.compact.join ", "
115
+ rescue
116
+ I18n.t "roles.#{ROLES[value.to_i - 1]}"
117
+ end
100
118
  end
101
119
  export_value do
102
- value.map { |v| bindings[:object].roles_enum.rassoc(v)[0] rescue nil }.compact.join ", " # used in exports, where no html/data is allowed
120
+ begin
121
+ value.map { |v| bindings[:object].roles_enum.rassoc(v)[0] rescue nil }.compact.join ", " # used in exports, where no html/data is allowed
122
+ rescue
123
+ I18n.t "roles.#{ROLES[value.to_i - 1]}"
124
+ end
103
125
  end
104
126
  queryable false
105
127
  end
@@ -112,6 +134,7 @@ class User < ApplicationRecord
112
134
  visible false
113
135
  end
114
136
  exclude_fields :lock_version
137
+ field :authentication_token
115
138
  # include UserRailsAdminListConcern
116
139
  end
117
140
  show do
@@ -1,3 +1,3 @@
1
1
  module Thecore
2
- VERSION = '1.4.8'.freeze
2
+ VERSION = '1.4.10'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: thecore
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.8
4
+ version: 1.4.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gabriele Tassoni