tramway-admin 1.3.9 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c15b37dd7636b4195a7bb077237268cdbb34136a8c698225bc6e07c09c4b0f
-  data.tar.gz: a0586620e311ea2d004c16590930ee06b0c920288263196462456e0a38327f4b
+  metadata.gz: fd4b7eca062f66b9e97bcf7953c068d55704f5aa605c0168d8ca316acae794f9
+  data.tar.gz: de703ec80b734dd8b669d1af172e9faa68dac1663917e9c208abd49740288cec
 SHA512:
-  metadata.gz: 49f4074477813e0fd05b7f55b6df64e3c3d9d90186393dd712a9d57d021d81646a12b9f39be9db0ee91b99101ce20fef7a0c84f932d6251f1b1efec7073a6a39
-  data.tar.gz: 7e4a78f259c7413eef0129cf9b52d63fe250b2db401e0751208fc6046933cfc4bf778a5145f0f1159b337f7c0689eba931aea3c024a18c352baff1185ed0fbd0
+  metadata.gz: a551f01c9b85f671971f6d238c027bbe1f7526c0cb267ee4a8e968789c186fd9d66e115d2c118d488c18c4714698d8c78e9a4d6ab79352c9d70a3abf801da184
+  data.tar.gz: 6a5d7024a942876a9d8c76ce4e6110db2b1d2cad0672bfa219ee092474b5b1d30baef806925f67425038c5984e8c09834ffaad3a2c2dd46e09fc0fa9e097a4a8

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

@@ -7,6 +7,7 @@ module Tramway
       include RussianCasesHelper
       include ::Tramway::Admin::RecordsHelper
       include ::Tramway::Admin::SingletonHelper
+      include ::Tramway::Collections::Helper
 
       def title(page_title = default_title)
         title_text = "#{page_title} | #{t('application.name')}"

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

@@ -8,7 +8,7 @@
     = render 'tramway/core/shared/messages', object: @record_form
 .row
   .col-lg-12
-    = simple_form_for @record_form.model, url: { controller: :records, action: action, model: @record_form.model.class }, input_html: { class: 'form-horizontal' } do |f|
+    = simple_form_for @record_form, url: { controller: :records, action: action, model: @record_form.model.class }, 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
       = f.button :submit, t('helpers.links.save'), class: 'btn-success'

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

@@ -1,9 +1,14 @@
 - value = params.dig(model_class.to_s.underscore, property.to_s)
 - form_object = instance_variable_get "@#{object}_form"
-- case type
-- when :default
-  = form.input property, 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)
-- when :association
-  = form.association property, 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: property.to_s.camelize.constantize.active
+- if type.is_a? Symbol
+  = form.label form_object.model.class.human_attribute_name property
+  - case type
+  - when :default
+    = form.input property, 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)
+  - when :association
+    = form.association property, 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: property.to_s.camelize.constantize.active
+  - else
+    = form.input property, as: type, label: false, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send(property) || value) } 
 - else
-  = form.input property, as: type, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send(property) || value) } 
+  - 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

data/lib/tramway/admin/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Admin
-    VERSION = '1.3.9'
+    VERSION = '1.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: '1.4'
 platform: ruby
 authors:
 - Pavel Kalashnikov