tramway-admin 1.18.1.1 → 1.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3774180f3fd03ac5863e9dd80e0f5d94b84eb044b7d7dca7bc093f3912e2de6c
-  data.tar.gz: 888c60435fa5b05e70168d0100f810ddde632498d43a6242baad93bc4148fc0f
+  metadata.gz: e2c16afaee00fcb3689426505b7fb0190c1a4420abbace26f0a6784377288b8f
+  data.tar.gz: c3e7f208e7509a1fd69680bbc7757f663a0efa63212051c4e6e1dad7d7c099dc
 SHA512:
-  metadata.gz: a0777804e0cc2843e5dec7fdf9f4dfa2147bcef1edaa11a9ffeb1dc4d8b89d166de46e9bc91e508cd078b7188eacfb7680af57e2b3418a42d16490fe4c5b6d43
-  data.tar.gz: 032d20a35cc34f5bb5960f0ce9a7ed2b5b5b81e6ff536065d6ef10d4a5e701c0f97365d862a000d7133405cfbcd7e533c39bca1776aacd92a7fcbb0a1c7fed5c
+  metadata.gz: ede5c9b2fa5efa26bf3f236a77686008f2c8195852fe9bc49fcbcde7914792458d49adcb8a974774d305b6778914e4fecdacae45fcb13d9cb43986867400c400
+  data.tar.gz: ea24e1ad62f3a14a12957b6e1e2e3866add1108024a91b7fc94b79b66ab9d52beee99f7e7660445878b5d64191e60191f13b9fac2f03b4624b152caa7c2833ad

data/app/controllers/tramway/admin/application_controller.rb

@@ -5,7 +5,7 @@ require 'tramway/helpers/class_name_helpers'
 module Tramway
   module Admin
     class ApplicationController < ::Tramway::Core::ApplicationController
-      include AuthManagement
+      include Tramway::AuthManagement
       include RecordRoutesHelper
       before_action :authenticate_admin!
       before_action :check_available!

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

@@ -11,7 +11,21 @@
     = form.input property, **polymorphic_association_params(object: object, form_object: form_object, property: property, value: value[:id])
     = 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])
   - 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) } 
+    = 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
-  - 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
+  - if type[:input_options]
+    - options = type[:input_options]
+    = form.label form_object.model.class.human_attribute_name property
+    - case type[: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), **options
+    - when :association
+      = form.association property, **association_params(form_object: form_object, property: property, value: value, object: object), **options
+    - when :polymorphic_association
+      = form.input property, **polymorphic_association_params(object: object, form_object: form_object, property: property, value: value[:id])
+      = 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
+    - else
+      = 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
+  - 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

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.18.1.1'
+    VERSION = '1.18.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.18.1.1
+  version: 1.18.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-19 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views