tramway-admin 1.3.9 → 1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a2c15b37dd7636b4195a7bb077237268cdbb34136a8c698225bc6e07c09c4b0f
4
- data.tar.gz: a0586620e311ea2d004c16590930ee06b0c920288263196462456e0a38327f4b
3
+ metadata.gz: fd4b7eca062f66b9e97bcf7953c068d55704f5aa605c0168d8ca316acae794f9
4
+ data.tar.gz: de703ec80b734dd8b669d1af172e9faa68dac1663917e9c208abd49740288cec
5
5
  SHA512:
6
- metadata.gz: 49f4074477813e0fd05b7f55b6df64e3c3d9d90186393dd712a9d57d021d81646a12b9f39be9db0ee91b99101ce20fef7a0c84f932d6251f1b1efec7073a6a39
7
- data.tar.gz: 7e4a78f259c7413eef0129cf9b52d63fe250b2db401e0751208fc6046933cfc4bf778a5145f0f1159b337f7c0689eba931aea3c024a18c352baff1185ed0fbd0
6
+ metadata.gz: a551f01c9b85f671971f6d238c027bbe1f7526c0cb267ee4a8e968789c186fd9d66e115d2c118d488c18c4714698d8c78e9a4d6ab79352c9d70a3abf801da184
7
+ data.tar.gz: 6a5d7024a942876a9d8c76ce4e6110db2b1d2cad0672bfa219ee092474b5b1d30baef806925f67425038c5984e8c09834ffaad3a2c2dd46e09fc0fa9e097a4a8
@@ -7,6 +7,7 @@ module Tramway
7
7
  include RussianCasesHelper
8
8
  include ::Tramway::Admin::RecordsHelper
9
9
  include ::Tramway::Admin::SingletonHelper
10
+ include ::Tramway::Collections::Helper
10
11
 
11
12
  def title(page_title = default_title)
12
13
  title_text = "#{page_title} | #{t('application.name')}"
@@ -8,7 +8,7 @@
8
8
  = render 'tramway/core/shared/messages', object: @record_form
9
9
  .row
10
10
  .col-lg-12
11
- = simple_form_for @record_form.model, url: { controller: :records, action: action, model: @record_form.model.class }, input_html: { class: 'form-horizontal' } do |f|
11
+ = simple_form_for @record_form, url: { controller: :records, action: action, model: @record_form.model.class }, input_html: { class: 'form-horizontal' } do |f|
12
12
  - @record_form.properties.each do |property, type|
13
13
  = render 'tramway/admin/shared/input', property: property, object: :record, type: type, form: f
14
14
  = f.button :submit, t('helpers.links.save'), class: 'btn-success'
@@ -1,9 +1,14 @@
1
1
  - value = params.dig(model_class.to_s.underscore, property.to_s)
2
2
  - form_object = instance_variable_get "@#{object}_form"
3
- - case type
4
- - when :default
5
- = 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)
6
- - when :association
7
- = 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
3
+ - if type.is_a? Symbol
4
+ = form.label form_object.model.class.human_attribute_name property
5
+ - case type
6
+ - when :default
7
+ = 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)
8
+ - when :association
9
+ = 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
10
+ - else
11
+ = 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) }
8
12
  - else
9
- = form.input property, as: type, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send(property) || value) }
13
+ - property_value = form_object.model.values.present? && form_object.model.values[property.to_s]
14
+ = render 'tramway/core/shared/input_extended', field: type[:extended_form_property], class_name: :record, value: property_value, f: form
@@ -1,5 +1,5 @@
1
1
  module Tramway
2
2
  module Admin
3
- VERSION = '1.3.9'
3
+ VERSION = '1.4'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tramway-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.9
4
+ version: '1.4'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Kalashnikov