tramway-admin 1.18.1.1 → 1.18.2

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/tramway/admin/application_controller.rb +1 -1
  3. data/app/views/tramway/admin/shared/_input.html.haml +17 -3
  4. data/lib/tramway/admin/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3774180f3fd03ac5863e9dd80e0f5d94b84eb044b7d7dca7bc093f3912e2de6c
4
- data.tar.gz: 888c60435fa5b05e70168d0100f810ddde632498d43a6242baad93bc4148fc0f
3
+ metadata.gz: e2c16afaee00fcb3689426505b7fb0190c1a4420abbace26f0a6784377288b8f
4
+ data.tar.gz: c3e7f208e7509a1fd69680bbc7757f663a0efa63212051c4e6e1dad7d7c099dc
5
5
  SHA512:
6
- metadata.gz: a0777804e0cc2843e5dec7fdf9f4dfa2147bcef1edaa11a9ffeb1dc4d8b89d166de46e9bc91e508cd078b7188eacfb7680af57e2b3418a42d16490fe4c5b6d43
7
- data.tar.gz: 032d20a35cc34f5bb5960f0ce9a7ed2b5b5b81e6ff536065d6ef10d4a5e701c0f97365d862a000d7133405cfbcd7e533c39bca1776aacd92a7fcbb0a1c7fed5c
6
+ metadata.gz: ede5c9b2fa5efa26bf3f236a77686008f2c8195852fe9bc49fcbcde7914792458d49adcb8a974774d305b6778914e4fecdacae45fcb13d9cb43986867400c400
7
+ data.tar.gz: ea24e1ad62f3a14a12957b6e1e2e3866add1108024a91b7fc94b79b66ab9d52beee99f7e7660445878b5d64191e60191f13b9fac2f03b4624b152caa7c2833ad
data/app/controllers/tramway/admin/application_controller.rb CHANGED
@@ -5,7 +5,7 @@ require 'tramway/helpers/class_name_helpers'
5
5
  module Tramway
6
6
  module Admin
7
7
  class ApplicationController < ::Tramway::Core::ApplicationController
8
- include AuthManagement
8
+ include Tramway::AuthManagement
9
9
  include RecordRoutesHelper
10
10
  before_action :authenticate_admin!
11
11
  before_action :check_available!
data/app/views/tramway/admin/shared/_input.html.haml CHANGED
@@ -11,7 +11,21 @@
11
11
  = form.input property, **polymorphic_association_params(object: object, form_object: form_object, property: property, value: value[:id])
12
12
  = form.input "#{property}_type", input_html: { name: "#{object}[#{property}_type]", id: "#{object}_#{property}_type", value: (form_object.send(property) || form_object.model.send("#{property}_type") || value[:type]) }, selected: (form_object.model.send("#{property}_type") || value[:type])
13
13
  - else
14
- = 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) }
14
+ = 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) }
15
15
  - else
16
- - property_value = form_object.model.values.present? && form_object.model.values[property.to_s]
17
- = render 'tramway/core/shared/input_extended', field: type[:extended_form_property], class_name: :record, value: property_value, f: form
16
+ - if type[:input_options]
17
+ - options = type[:input_options]
18
+ = form.label form_object.model.class.human_attribute_name property
19
+ - case type[:type]
20
+ - when :default
21
+ = 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), **options
22
+ - when :association
23
+ = form.association property, **association_params(form_object: form_object, property: property, value: value, object: object), **options
24
+ - when :polymorphic_association
25
+ = form.input property, **polymorphic_association_params(object: object, form_object: form_object, property: property, value: value[:id])
26
+ = form.input "#{property}_type", input_html: { name: "#{object}[#{property}_type]", id: "#{object}_#{property}_type", value: (form_object.send(property) || form_object.model.send("#{property}_type") || value[:type]) }, selected: (form_object.model.send("#{property}_type") || value[:type]), **options
27
+ - else
28
+ = form.input property, as: type[:type], label: false, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.send(property) || form_object.model.send(property) || value) }, **options
29
+ - else
30
+ - property_value = form_object.model.values.present? && form_object.model.values[property.to_s]
31
+ = 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 CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Tramway
4
4
  module Admin
5
- VERSION = '1.18.1.1'
5
+ VERSION = '1.18.2'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tramway-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.18.1.1
4
+ version: 1.18.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Kalashnikov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-10-19 00:00:00.000000000 Z
11
+ date: 2019-11-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bootstrap-kaminari-views