tramway-core 1.17.4.2 → 1.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de93e7e3470ae4475e2562917ada23727724ed9f5d3a9e8629bb79abdc9abba3
-  data.tar.gz: 6eb2a75350e87dfcc01c80da40090ac4c14a7ef4d6d713a1e1ec6ad6fba36e8f
+  metadata.gz: 4df35307c9140e7bcf6503817d863325df4d91a20707e656d3ee31a03cb34614
+  data.tar.gz: 46d7f33ea78efd74ce8f733cc51d036ad76d4035cd56908be4a83c900c649ca1
 SHA512:
-  metadata.gz: 70846eaa98acc8df08009b4c5b0ee6e954c885e87342eaa17f0cbce2cb4fa25f78a51604b234170ee0502c33195e74095a5a27b14565cf04ae6612630896092a
-  data.tar.gz: 020e281d3e91424d0af2ccf2e4f8554b2f1295b399433f7ce5238fe181d1d1fb4ec999773bd408a57af12e7386d5bd39211bc15d32e1562b3dc1d0de61e124cd
+  metadata.gz: f9454bba3b27dae96f688afc0eab43985f9ffb774b9439a12f6c044c26c8ac6425c2c443be1afec88f2b0283556dccd0455fac3eb3fe6e94692f17933eaa4e5c
+  data.tar.gz: c9a1e1559d97cf13b044214b89f4e383901203d1fccd3ff4be2e51c0aeb02ab078ede1f0646c10d6df1d70f9dfba7b16ae1006b819ad72282d9e030cb12dc874

data/app/forms/tramway/core/application_forms/association_object_helpers.rb

@@ -6,6 +6,7 @@ module Tramway::Core::ApplicationForms::AssociationObjectHelpers
       define_polymorphic_association association, class_name
     else
       self.class.send(:define_method, "#{association}=") do |value|
+        model.send "#{association}_id=", value
         super class_name.find value
       end
     end

data/app/helpers/tramway/core/inputs_helper.rb

@@ -18,7 +18,7 @@ module Tramway::Core::InputsHelper
         value: (form_object.send(property) || form_object.model.send("#{property}_id") || value)
       },
       selected: (form_object.model.send("#{property}_id") || value),
-      collection: full_class_name_association.active.map do |obj|
+      collection: full_class_name_association.active.send("#{current_user.role}_scope", current_user.id).map do |obj|
         decorator_class(full_class_name_association).decorate obj
       end.sort_by(&:name)
     }.merge options
@@ -27,7 +27,7 @@ module Tramway::Core::InputsHelper
   def polymorphic_association_params(object:, form_object:, property:, value:, options: {})
     full_class_names = form_object.model.class.send("#{property}_type").values.map &:constantize
     collection = full_class_names.map do |class_name|
-      class_name.active.map do |obj|
+      class_name.active.send("#{current_user.role}_scope", current_user.id).map do |obj|
         decorator_class(class_name).decorate obj
       end
     end.flatten.sort_by { |obj| obj.name.to_s }

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '1.17.4.2'
+    VERSION = '1.17.5'
   end
 end

metadata

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