tramway-core 1.18.1.1 → 1.18.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff863d7c75ba76a10d1f9c751b9710474a16b0cd126a6974224d8cbcb26d9dd4
-  data.tar.gz: b890fdbb1e3a33e6dc9cac04ca8cc3d91a5c240a9337c4313b576faf44f47c7b
+  metadata.gz: 2eca2bd589fed76d9385bbed1319fbd061e418521966d81561bf8ffeaa3648c9
+  data.tar.gz: 67488c6b5304f9941220b9bcb97d6ca5271e414e323d7c64806805e5aea5deb5
 SHA512:
-  metadata.gz: 2ae3500906ffdc568ce881fad3c6581958bfcb32d5f145242f93eac7d6710a05a0d549e734ae3542040366cc75e584846f5100bdcada8e29e9529975f6e194af
-  data.tar.gz: f6be135129633829f2585831fc2576a566618f023f1bc4ab15f7b96e35437c9fddc668c6fa14a02d273d3c46e8c5ee5be4149946f6df8a679fe5628c8a26d398
+  metadata.gz: 3f8da95bb6038a4e3bb956fcf0a7851cb2e81a82392a92fd00a1d1337eaad0a13f5a852a2a8701bcead04eb1250ac17335d5bf44deb18c4dbcf3df980026e275
+  data.tar.gz: be00745caa58c4703b5dca9eb53ef6dc8d16917d39c510f0d95efac655c165fa5eec00e6813424eba5edd0f78377c60bbdb77688a3f7895b4ab8d9910f051617

data/app/controllers/tramway/core/application_controller.rb

@@ -15,4 +15,8 @@ class Tramway::Core::ApplicationController < ActionController::Base
   def model_class
     params[:model].constantize
   end
+
+  def authenticated_user
+    (defined?(current_user) && current_user.try(:model)) || (defined?(current_admin) && current_admin.model)
+  end
 end

data/app/helpers/tramway/core/inputs/associations_helper.rb

@@ -2,9 +2,10 @@
 
 module Tramway::Core::Inputs::AssociationsHelper
   def build_collection_for_association(form_object, property)
+    user = defined?(current_user) ? current_user : current_admin
     full_class_name_association = form_object.class.full_class_name_association(property)
     check_valid_association full_class_name_association
-    full_class_name_association.active.send("#{current_user.role}_scope", current_user.id).map do |obj|
+    full_class_name_association.active.send("#{user.role}_scope", user.id).map do |obj|
       decorator_class(full_class_name_association).decorate obj
     end.sort_by(&:name)
   end

data/app/helpers/tramway/core/inputs/polymorphic_associations_helper.rb

@@ -2,8 +2,9 @@
 
 module Tramway::Core::Inputs::PolymorphicAssociationsHelper
   def build_collection_for_polymorphic_association(form_object, property)
+    user = defined?(current_user) ? current_user : current_admin
     object_names = full_class_names(form_object, property).map do |class_name|
-      class_name.active.send("#{current_user.role}_scope", current_user.id).map do |obj|
+      class_name.active.send("#{user.role}_scope", user.id).map do |obj|
         decorator_class(class_name).decorate obj
       end
     end.flatten

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.18.1.1'
+    VERSION = '1.18.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.18.1.1
+  version: 1.18.1.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited