tramway-core 3.0.0.2 → 4.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 529b5f8a64a008d6bf7d0d06323887ef33d5437e87fa0ed740687b1cb6751400
-  data.tar.gz: 83fa2ee3b66c07d3473d6298007267e0faaa37404bc75fe486518358fcb7d1f1
+  metadata.gz: 8890a9c13beaa7437586235ea24169dfd400bac802f1e09e02b3f00482b56353
+  data.tar.gz: 5b19c2fe614f4ec053c661e4fd6f65479d4987f8fe9731c930a0b923769c8df6
 SHA512:
-  metadata.gz: 2a30c44169bc75fff6ed5244a8fa498cd4ee206c43e7240e23982f581aacdb6ab80c370cdaec839f119c956003acfd84f9b3b19c1b9fc73ca20100dfcdbc387b
-  data.tar.gz: 9f754f5466c6fd0e0deb2b66ee84909f1162bee38f7d7e4a6217d73eef95cb98ed2471ce3a37adb680415f8c96b4ef5980c67f13ea1c510181ebf00a64ffe02f
+  metadata.gz: f61ca8ebb144658a152920461dabb7423cfc66418e124ab6973a80aa960a8365d9a027edbb2df5385ee33ba559ec2e89df423d8a3c1e781d2c60d52049d2a2a1
+  data.tar.gz: a57f6625750a1c6b528e461f1f2269bcdd7f302d046b00a8a7426c45aa7cf203082bb3fcaf7eece3871ca557fd307edc9120141f70a0521f85ec92b12fbe5b7d

data/app/assets/javascripts/tramway/core/application.js

@@ -1,10 +1,6 @@
-// require popper FIXME should be optional requiring
 //= require jquery
 //= require jquery_ujs
 //= require jquery3
-//= require popper
-// require popper FIXME should be optional requiring
-//= require bootstrap
 //= require bootstrap-datepicker-1.8.0
 //= require bootstrap-datepicker-1.8.0.ru.min
 //= require font_awesome5

data/app/decorators/tramway/core/application_decorator.rb

@@ -62,7 +62,7 @@ class Tramway::Core::ApplicationDecorator
     end
 
     def decorate(object_or_array)
-      if object_or_array.class.superclass == ActiveRecord::Relation
+      if object_or_array.class.superclass == ActiveRecord::Relation || object_or_array.class.to_s.include?('ActiveRecord_AssociationRelation')
         decorated_array = object_or_array.map do |obj|
           new obj
         end

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

@@ -5,6 +5,13 @@ module Tramway::Core::InputsHelper
   include Tramway::Core::Inputs::PolymorphicAssociationsHelper
 
   def association_params(form_object:, property:, value:, object:, options: {})
+    full_class_name_association = form_object.class.full_class_name_association(property)
+
+    if full_class_name_association.to_s == 'Tramway::User::User'
+      user = defined?(current_user) ? current_user : current_admin
+      value = user.id
+    end
+
     build_input_attributes(object: object, property: property, options: options,
                            value: build_value_for_association(form_object, property, value),
                            collection: build_collection_for_association(form_object, property),

data/app/views/tramway/core/shared/_input.html.haml

@@ -6,7 +6,7 @@
   - type = type[:type]
 - if type.class.in?([ Symbol, String ]) || type&.dig(:input_options)
   - type = type.to_sym
-  - unless type == :hidden
+  - if type != :hidden && input_params.dig(:options, :label) != false
     = form.label form_object.model.class.human_attribute_name property
   - case type
   - when :default

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '3.0.0.2'
+    VERSION = '4.0.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.2
+  version: 4.0.0.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited