tramway-admin 2.1.0.1 → 2.1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f1df8f432adde2da452b7fd80c31455b60c0f9780bf2fbef6e5d2df32bbf93
-  data.tar.gz: f89edad193cc1af91d7ed050d0e00e12b5a8b64b0539cdb5236ece6fe9e11cae
+  metadata.gz: 546beae8f4da6b321d696e39c446439ba17a2ed03de194baf6f2b66aeb603e7d
+  data.tar.gz: bcfc6a18161c2138d83b029ffd057caced1559b6128b85f67989dfcc1c1eb05c
 SHA512:
-  metadata.gz: e3f6f4afc8b26b1eca9bb2d514c123e4402db45ce485703ab16c78c7414bea00e5dccc4ca2db06a04503f920a3c522bddd65e024a5e903aac0fadf23ddb646c2
-  data.tar.gz: 1a7d2edf8c8c43336915d02fd95efc21fcbc6618e8a6cde73ca62513d66149bda94614b5fac4e43819a9af908a74ea65943d3af63799fe2db3e8136b4256b64c
+  metadata.gz: e2b90fa18036b7608b6f931406c17f26f774fc2ee8b675c79c888faeab3cc74091ad4d4e093118e2b265752b06085d7f6a453e0bd17e4bf2f6860621aff586b6
+  data.tar.gz: f4b441e84898e5608ef190ea19a4e1b56b46c189bfe9369774a4a5bb48b4dc98ad2f896057d6fd07e1f0a6d82641146c7eeda098b6872f94ee74bf4e98dd9c58

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

@@ -3,7 +3,8 @@
 module Tramway::Admin::AdditionalButtonsBuilder
   def build_button(button)
     options = button[:options] || {}
-    concat(link_to(button[:url], method: button[:method], class: "btn btn-#{button[:color]} btn-xs", **options) do
+    style = 'margin-right: 8px'
+    concat(link_to(button[:url], method: button[:method], class: "btn btn-#{button[:color]} btn-xs", style: style, **options) do
       button[:inner]&.call
     end)
   end

data/app/views/tramway/admin/shared/show/associations/_row.html.haml

@@ -1,16 +1,19 @@
-- if object.class.show_associations.map(&:to_s).include? association.name.to_s
-  - association_type = association.class.to_s.split('::').last.sub(/Reflection$/, '').underscore.to_sym
-  %tr
-    %td
-      = model_class.human_attribute_name association.name
-      %hr
-      - if association_type != :has_one || !object.send(association.name).present?
-        = link_to "#{I18n.t('helpers.actions.add')} #{model_class.human_attribute_name(association.name).singularize.downcase}", new_associated_record_path(association: association, object: object, as: object.send("#{association.name}_as")), class: 'btn btn-primary'
-    %td{ colspan: 2 }
-      - if association_type.in? [ :has_one, :belongs_to ]
-        %table.table.table-striped.table-bordered
-          = render 'tramway/admin/shared/show/associations/table_row', object: object, association: association, association_object: object.send(association.name)
-      - else
-        %table.table.table-striped.table-bordered
-          - object.send(association.name)&.each do |association_object|
-            = render 'tramway/admin/shared/show/associations/table_row', object: object, association: association, association_object: association_object
+- if object.class.show_associations.nil?
+  = "Please, fill show associations method in decorator"
+- else
+  - if object.class.show_associations.map(&:to_s).include? association.name.to_s
+    - association_type = association.class.to_s.split('::').last.sub(/Reflection$/, '').underscore.to_sym
+    %tr
+      %td
+        = model_class.human_attribute_name association.name
+        %hr
+        - if association_type != :has_one || !object.send(association.name).present?
+          = link_to "#{I18n.t('helpers.actions.add')} #{model_class.human_attribute_name(association.name).singularize.downcase}", new_associated_record_path(association: association, object: object, as: object.send("#{association.name}_as")), class: 'btn btn-primary'
+      %td{ colspan: 2 }
+        - if association_type.in? [ :has_one, :belongs_to ]
+          %table.table.table-striped.table-bordered
+            = render 'tramway/admin/shared/show/associations/table_row', object: object, association: association, association_object: object.send(association.name)
+        - else
+          %table.table.table-striped.table-bordered
+            - object.send(association.name)&.each do |association_object|
+              = render 'tramway/admin/shared/show/associations/table_row', object: object, association: association, association_object: association_object

data/app/views/tramway/admin/shared/show/associations/_table_row.html.haml

@@ -1,4 +1,3 @@
-- association_state_machines = object.send("#{association.name}_state_machines")
 - if (!association_object.is_a?(Array) || !association_object.empty?) && association_object.present?
   %tr{ id: "#{association.name}_#{association_object.id}" }
     %td
@@ -6,8 +5,9 @@
     %td
       = link_to association_object.name, record_path(association_object.id, model: association.options[:class_name])
     %td
-      - association_state_machines.each do |state_method|
-        = state_events_buttons association_object, state_method: state_method, model_param_name: :record, controller: 'tramway/admin/records', action: :update, parameters: { redirect: current_model_record_path(object.id), model: association_object.class.model_name }, button_options: { class: :smart_button }
+      - association_object.model.class.state_machines_names.each do |state_method|
+        - unless state_method == 'default'
+          = state_events_buttons association_object, state_method: state_method, model_param_name: :record, controller: 'tramway/admin/records', action: :update, parameters: { redirect: current_model_record_path(object.id), model: association_object.class.model_name }, button_options: { class: :smart_button }
     %td
       - if update_is_available? association_object, object
         = edit_button url: edit_record_path(association_object.id, model: association.options[:class_name], redirect: current_model_record_path(object.id)), button_options: { class: 'btn btn-xs btn-warning edit' } do

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '2.1.0.1'
+    VERSION = '2.1.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 2.1.0.1
+  version: 2.1.1.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core
@@ -310,7 +310,7 @@ files:
 - lib/tramway/admin/tramway_model_helper.rb
 - lib/tramway/admin/version.rb
 - lib/tramway/admin/welcome_page_actions.rb
-homepage: https://github.com/kalashnikovisme/tramway-dev
+homepage: https://github.com/purple-magic/tramway-admin
 licenses:
 - MIT
 metadata: {}
@@ -329,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Engine for admin