thecore 1.4.8 → 1.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4600fe4f44c7075a60b7118b759278e305cab539
-  data.tar.gz: 38636092254326d28dc90b3e139aa02f686cfbe9
+  metadata.gz: 89226b95672590a7bb4e37006bf9d309df3b977a
+  data.tar.gz: a3a6192e70e327554a52a8a2dbb7331cffdb8aaf
 SHA512:
-  metadata.gz: ce80df2f81a9ab16281f8cf836cd2a28a0ffc1ff7bc61b5e0b615f1d00a3b5a1ac928d666c9e3ae9be36b76e02ee86ba41759d1900d61340792efeb9b2806495
-  data.tar.gz: b786d380c39ea3d2e936425f417107223775fc28aaabf56eaaed785bbb23a7760628a35cfc6606bf3bf2820880142773850eb20d9b5b38e9a63b209daee778c6
+  metadata.gz: 4e8999c7b950a0b90355af8a2a9a58ff65670344bce215e2144a2b3f715a5fc521cfcffb540ea54b305a218902bf792aa285042720d10d5b67d2dfde4c9add8e
+  data.tar.gz: 125065f52f176d66b700320bbdf06963239cfe6c8338b57a095cbcbf56c11351797ee74283f1d9f4949b7740227ee442033e4614d13fa4c79f1239ed26499fd9

data/app/models/user.rb

@@ -23,6 +23,8 @@ class User < ApplicationRecord
   validates :password, presence: true, on: :create
   validates :password_confirmation, presence: true, on: :create
 
+  validates :roles, presence: true, on: :create
+
   def self.paged(page_number)
     order(admin: :desc, username: :asc).page page_number
   end
@@ -54,7 +56,7 @@ class User < ApplicationRecord
     username
   end
 
-  #serialize :roles, Array
+  # serialize :roles, Array if Settings.single_role_per_user == "f"
   def roles_enum
     # Do not EDIT below this line
     ROLES.each_with_index.map {|a,i| [I18n.t("roles.#{a.to_sym}"), (i+1).to_s]}
@@ -64,8 +66,20 @@ class User < ApplicationRecord
     # if user.has_role? :admin
 
     # 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 .
-    chosen_roles = self.roles.map { |r| r.blank? ? nil : ROLES[r.to_i - 1] }
-    chosen_roles.compact.include? role
+    begin
+      # roles array (enum)
+      chosen_roles = self.roles.map { |r| r.blank? ? nil : ROLES[r.to_i - 1] }
+      chosen_roles.compact.include? role
+    rescue
+      # single role
+      # ROLES[self.roles.to_i - 1] == role
+      Rails.logger.debug "ROLES: #{self.roles.to_s}"
+      self.roles.to_s == role.to_s
+    end
+  end
+
+  def roles
+    ROLES[super.to_i - 1]
   end
 
   RailsAdmin.config do |config|
@@ -96,10 +110,18 @@ class User < ApplicationRecord
       field :roles, :enum do
         visible !ROLES.blank?
         pretty_value do # used in list view columns and show views, defaults to formatted_value for non-association fields
-          value.map { |v| bindings[:object].roles_enum.rassoc(v)[0] rescue nil }.compact.join ", "
+          begin
+            value.map { |v| bindings[:object].roles_enum.rassoc(v)[0] rescue nil }.compact.join ", "
+          rescue
+            I18n.t "roles.#{ROLES[value.to_i - 1]}"
+          end
         end
         export_value do
-          value.map { |v| bindings[:object].roles_enum.rassoc(v)[0] rescue nil }.compact.join ", " # used in exports, where no html/data is allowed
+          begin
+            value.map { |v| bindings[:object].roles_enum.rassoc(v)[0] rescue nil }.compact.join ", " # used in exports, where no html/data is allowed
+          rescue
+            I18n.t "roles.#{ROLES[value.to_i - 1]}"
+          end
         end
         queryable false
       end
@@ -112,6 +134,7 @@ class User < ApplicationRecord
           visible false
         end
         exclude_fields :lock_version
+        field :authentication_token
         # include UserRailsAdminListConcern
       end
       show do

data/lib/thecore/version.rb

@@ -1,3 +1,3 @@
 module Thecore
-  VERSION = '1.4.8'.freeze
+  VERSION = '1.4.10'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thecore
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.10
 platform: ruby
 authors:
 - Gabriele Tassoni