tramway-admin 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a2a56bffe733cd1f509a4985f7fe836b1c0c9be9d491f9a1d32666a5d0e35dc
-  data.tar.gz: a55b3b8e3cb07eab73a800b5a7686e45c8e80cf7537aaef8c768817ea48aa7c9
+  metadata.gz: 959923ec126cc2ad6eedf2340f9dce83abfb088de7442e43c75e314293b6a715
+  data.tar.gz: 6061788f3802b330a9824d19621166122c271e7361be18e7def040db1592e247
 SHA512:
-  metadata.gz: 352aab18aa2acf5ba032b9cb4654984d4aa0f3b7f9f6b669c34c1cc7e2780246c1dbe5f6f5232e61fe08448e28bfd777f67541941f68d7185e1d8db30cfe1e1c
-  data.tar.gz: b3a62a142c794e7cd5e9d0d0fbe6e535de212d51c5797a252616eb90662d85bd49385c098c1fc3560575a5239efc60e989dce97fd140b46e4575c9e6d5d47982
+  metadata.gz: 784fe259164a1bd42d894788bb408bca0aa5b8de7c2d7e7e4dda38f6e03991733cb45d63fd1915e874509e301bff19a75b592ec257591aa6e9fae4b0b6e2e058
+  data.tar.gz: ed6f8a027ad64c2c1dea7e2cb44316171e1e3d3a933863e37f584ac432256957ea431e2a3667eaa845c0b008286c1e8f62345e207831d174899f980c0ce00cfe

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

@@ -22,8 +22,8 @@ module Tramway
       end
 
       def collections_counts
-        @counts = "#{params[:model]}Decorator".constantize.collections.reduce({}) do |hash, collection|
-          hash.merge! collection => params[:model].constantize.active.send(collection).count
+        @counts = decorator_class.collections.reduce({}) do |hash, collection|
+          hash.merge! collection => model_class.active.send(collection).count
         end
       end
 

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

@@ -10,10 +10,6 @@
   .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|
       - @record_form.properties.each do |property, type|
-        - value = params.dig(model_class.to_s.underscore, property.to_s)
-        - if type == :default
-          = f.input property, input_html: { name: "record[#{property}]", id: "record_#{property}", value: (@record_form.model.send(property) || value) }, selected: (@record_form.model.send(property) || value)
-        - else
-          = f.input property, as: type, input_html: { name: "record[#{property}]", id: "record_#{property}", value: (@record_form.model.send(property) || value) } 
+        = render 'tramway/admin/shared/input', property: property, object: :record, type: type, form: f
       = 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/app/views/tramway/admin/shared/_input.html.haml

@@ -0,0 +1,9 @@
+- 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.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.model.send(property) || value) }, selected: (form_object.model.send(property) || value)
+- else
+  = form.input property, as: type, input_html: { name: "#{object}[#{property}]", id: "#{object}_#{property}", value: (form_object.model.send(property) || value) } 

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

@@ -10,9 +10,6 @@
   .col-lg-12
     = simple_form_for @singleton_form.model, url: { controller: :singletons, action: action, model: @singleton_form.model.class }, input_html: { class: 'form-horizontal' } do |f|
       - @singleton_form.properties.each do |property, type|
-        - if type == :default
-          = f.input property, input_html: { name: "singleton[#{property}]", id: "singleton_#{property}" } 
-        - else
-          = f.input property, as: type, input_html: { name: "singleton[#{property}]", id: "singleton_#{property}" } 
+        = render 'tramway/admin/shared/input', property: property, object: :singleton, type: type, form: f
       = f.button :submit, t('helpers.links.save'), class: 'btn-success'
       = link_to t('helpers.links.back'), singleton_path, class: 'btn btn-secondary'

data/lib/tramway/admin/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Admin
-    VERSION = '1.2.2'
+    VERSION = '1.2.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-user
@@ -161,7 +161,6 @@ files:
 - app/helpers/tramway/admin/records_helper.rb
 - app/helpers/tramway/admin/russian_cases_helper.rb
 - app/helpers/tramway/admin/singleton_helper.rb
-- app/helpers/tramway/admin/welcome_helper.rb
 - app/jobs/tramway/admin/application_job.rb
 - app/mailers/tramway/admin/application_mailer.rb
 - app/models/tramway/user/user.rb
@@ -174,6 +173,7 @@ 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/singletons/_form.html.haml
 - app/views/tramway/admin/singletons/edit.html.haml
 - app/views/tramway/admin/singletons/new.html.haml

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

@@ -1,4 +0,0 @@
-module Tramway::Admin
-  module WelcomeHelper
-  end
-end