tramway-admin 1.28.0.1 → 1.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 374edd0b18c286dc1420409c506829049c419ead74336b62b907a95e4b7667fb
-  data.tar.gz: 4991e8bd1cf2d706a75bb0861e9ea34f88ac4fb7eb7f7c32bae3aec057f163b8
+  metadata.gz: 014b33b22a49ea50a02c62acc74843d3a10f1bedf145c23bf1f551d3cbe19f25
+  data.tar.gz: 1876e573d17d2a4f23000b30f9552a56db789583fb913f12e53da233757fa48e
 SHA512:
-  metadata.gz: 91afe926391ff2bfc6253fb3b80d7ee7f57e7fe0d4c9cf6b2a3be1aeb1620e1fd82da4883a144eff61a417a7a20593328bb8f7cb866d5059782e0e8be5837d53
-  data.tar.gz: 856d74e90b384d4e31f3ae751cf0196d0d40ac881904e1afdf001cbf91f571526c4a53891bf6766f700afb348f6cca75f6290f1423db17ffc6c6c6f748c861d5
+  metadata.gz: 44158cd39d3f13f265dee522c363f0c64abe296227300ab645f45882153a09e2b63687122f0e41b9f84fd30b1743480a2f88d7516fe9f83022f9d37692282bce
+  data.tar.gz: 0ebf861138c441f5bd94ac2edce8551c40b03cc24732dc21c02c2fc11b44fed8ea4ee1b70b5b858d6aa1be7f6d7afd29c86f87e27ceaabeb61d501f66a5cff96

data/app/helpers/tramway/admin/application_helper.rb

@@ -12,7 +12,7 @@ module Tramway
       include ::Tramway::Admin::RecordsHelper
       include ::Tramway::Admin::SingletonHelper
       include ::Tramway::Admin::NavbarHelper
-      include ::Tramway::Admin::InputsHelper
+      include ::Tramway::Core::InputsHelper
       include ::Tramway::Admin::FocusGeneratorHelper
       include ::Tramway::Admin::ActionsHelper
       include ::Tramway::Collections::Helper

data/app/views/tramway/admin/records/_form.html.haml

@@ -10,7 +10,7 @@
   .col-lg-12
     = simple_form_for @record_form, url: { controller: :records, action: action, model: @record_form.model.class }, method: method, input_html: { class: 'form-horizontal' } do |f|
       - @record_form.properties.each do |property, type|
-        = render 'tramway/admin/shared/input', property: property, object: :record, type: type, form: f
+        = render 'tramway/core/shared/input', property: property, object: :record, type: type, form: f, destination: :admin
       = hidden_field_tag :redirect, params[:redirect]
       = f.button :submit, t('helpers.links.save'), class: 'btn-success'
       = link_to t('helpers.links.back'), current_model_records_path, class: 'btn btn-secondary'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.28.0.1'
+    VERSION = '1.28.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.28.0.1
+  version: 1.28.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
@@ -191,7 +191,6 @@ files:
 - app/helpers/tramway/admin/application_helper.rb
 - app/helpers/tramway/admin/cases_helper.rb
 - app/helpers/tramway/admin/focus_generator_helper.rb
-- app/helpers/tramway/admin/inputs_helper.rb
 - app/helpers/tramway/admin/navbar_helper.rb
 - app/helpers/tramway/admin/records_helper.rb
 - app/helpers/tramway/admin/russian_cases_helper.rb
@@ -208,7 +207,6 @@ files:
 - app/views/tramway/admin/records/index.html.haml
 - app/views/tramway/admin/records/new.html.haml
 - app/views/tramway/admin/records/show.html.haml
-- app/views/tramway/admin/shared/_input.html.haml
 - app/views/tramway/admin/shared/_show.html.haml
 - app/views/tramway/admin/shared/errors/server_error.html.haml
 - app/views/tramway/admin/shared/show/_attribute_tr.html.haml

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

@@ -1,97 +0,0 @@
-# frozen_string_literal: true
-
-module Tramway
-  module Admin
-    module InputsHelper
-      def association_params(form_object:, property:, value:, object:, options: {})
-        full_class_name_association = form_object.class.full_class_name_association(property)
-        unless full_class_name_association
-          raise "It seems you've defined association attributes with `property` method. Please, use `association` method. `association :#{property}`"
-        end
-        if full_class_name_association.is_a? Array
-          raise "It seems you've used `association` input type in the Form. Please, use `polymorphic_association` type. `#{property}: :polymorphic_association`"
-        end
-
-        {
-          label: false,
-          input_html: {
-            name: "#{object}[#{property}]",
-            id: "#{object}_#{property}",
-            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|
-            decorator_class(full_class_name_association).decorate obj
-          end.sort_by(&:name)
-        }.merge options
-      end
-
-      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|
-            decorator_class(class_name).decorate obj
-          end
-        end.flatten.sort_by { |obj| obj.name.to_s }
-        builded_value = if form_object.send(property).present?
-                          "#{form_object.send(property).class.to_s.underscore}_#{form_object.send(property).id}"
-                        else
-                          "#{value[:type]&.underscore}_#{value[:id]}"
-                        end
-        {
-          as: :select,
-          label: false,
-          input_html: {
-            name: "#{object}[#{property}]",
-            id: "#{object}_#{property}",
-            value: builded_value
-          },
-          selected: builded_value,
-          collection: collection,
-          label_method: lambda do |obj|
-            "#{obj.class.model_name.human} | #{obj.name}"
-          end,
-          value_method: lambda do |obj|
-            "#{obj.class.to_s.underscore.sub(/_decorator$/, '')}_#{obj.id}"
-          end
-        }.merge options
-      end
-
-      def value_from_params(model_class:, property:, type:)
-        case type
-        when :polymorphic_association, 'polymorphic_association'
-          {
-            id: params.dig(model_class.to_s.underscore, property.to_s),
-            type: params.dig(model_class.to_s.underscore, "#{property}_type")
-          }
-        else
-          params.dig(model_class.to_s.underscore, property.to_s)
-        end
-      end
-
-      def default_params(property:, object:, form_object:, value:, options: {})
-        {
-          label: false,
-          input_html: {
-            name: "#{object}[#{property}]",
-            id: "#{object}_#{property}",
-            value: (form_object.send(property) || form_object.model.send(property) || value)
-          },
-          selected: (form_object.model.send(property) || value)
-        }.merge options
-      end
-
-      def else_params(property:, object:, type:, form_object:, value:, options: {})
-        {
-          as: type,
-          label: false,
-          input_html: {
-            name: "#{object}[#{property}]",
-            id: "#{object}_#{property}",
-            value: (form_object.send(property) || form_object.model.send(property) || value)
-          }
-        }.merge options
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-- value = value_from_params(model_class: model_class, property: property, type: type)
-- form_object = instance_variable_get "@#{object}_form"
-- input_params = { property: property, object: object, form_object: form_object, value: value }
-- if !type.class.in?([ Symbol, String ]) && type[:input_options]
-  - input_params.merge!(options: type[:input_options])
-  - type = type[:type]
-- if type.class.in?([ Symbol, String ]) || type&.dig(:input_options)
-  - type = type.to_sym
-  = form.label form_object.model.class.human_attribute_name property
-  - case type
-  - when :default
-    = form.input property, **default_params(**input_params)
-  - when :association
-    = form.association property, **association_params(**input_params)
-  - when :polymorphic_association
-    = form.input property, **polymorphic_association_params(**input_params.merge(value: value))
-  - else
-    = form.input property, **else_params(**input_params.merge(type: type))
-- else
-  - property_value = form_object.model.values.present? && form_object.model.values[property.to_s]
-  = render 'tramway/core/shared/input_extended', field: type[:extended_form_property], class_name: :record, value: property_value, f: form