tramway-admin 1.29.1.5 → 1.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 684985c2ee2576e0240cdf2a35308044f98cbac2cf03d68ac45f6c986b7042ea
-  data.tar.gz: 3c009c10ec87984dea44de3193f37d2bb494f7ffa26e1ecb29e7f0e7fe50cad7
+  metadata.gz: cb8572d620231b636f36ee41b63de90c82cf6bbda55bd49d43018e13a81e9bb4
+  data.tar.gz: 38aa095dc281d92baacf40504cd56790bac6ff071dcfd238d0d6a98e4b49cd7e
 SHA512:
-  metadata.gz: 6cc5247ac2bd3006c58aaf0e3eba492d96a2b95478fe199fe2561e62e25aba4b2aa3fd87a05afd06f93707da3a83616675e6f3f7d2f543a75bf5228335781110
-  data.tar.gz: f521d26062127bde2bb94fe5be738bac88d098cc79fd18b826f29080916e3b9c2baf05c7bcb30a3499e01d5f464fa763a3065bd0d99bd9d8e5137900e9f1eaa6
+  metadata.gz: e9534f3052c14aa43b8dbf06dbbef7c61030e4fe5e8a901dfc07863caf349af8c2d8b3da153b766cc39d3a5bf98e53e5507208c224643af79f6bc48458649b53
+  data.tar.gz: 777695f2b36a4ee82e9848c25fefb79e40bfb35bbd214e97a0b3e6c0c676499ea24961f636883ed15a70fae36230d6a348cd2a854b07eb1cece6e3ba63dd9292

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

@@ -1,8 +1,16 @@
 - 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
-      = 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'
+      - 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 }
-      = render 'tramway/admin/shared/show/associations/list', object: object, association: association
+      - 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

@@ -0,0 +1,20 @@
+- 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
+      = association_object.id
+    %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 }
+    %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
+          = fa_icon 'pencil-alt'
+      - if destroy_is_available? association_object, object
+        = delete_button url: record_path(association_object.id, model: association.options[:class_name], redirect: current_model_record_path(object.id)), button_options: { class: 'btn btn-xs btn-danger delete' } do
+          = fa_icon 'trash-alt'
+      - if habtm_destroy_is_available? association_object, object
+        = delete_button url: has_and_belongs_to_many_record_path(association_object.id, model_class: object.model.class, object_id: object.id, form: "Admin::#{object.model.class.to_s.pluralize}::Remove#{association_object.model.class.to_s}Form", redirect: current_model_record_path(object.id)), button_options: { class: 'btn btn-xs btn-danger delete' } do
+          = fa_icon 'trash-alt'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.29.1.5'
+    VERSION = '1.29.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.29.1.5
+  version: 1.29.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -211,8 +211,8 @@ files:
 - app/views/tramway/admin/shared/errors/server_error.html.haml
 - app/views/tramway/admin/shared/show/_attribute_tr.html.haml
 - app/views/tramway/admin/shared/show/associations/_habtm_row.html.haml
-- app/views/tramway/admin/shared/show/associations/_list.html.haml
 - app/views/tramway/admin/shared/show/associations/_row.html.haml
+- app/views/tramway/admin/shared/show/associations/_table_row.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/views/tramway/admin/shared/show/associations/_list.html.haml

@@ -1,21 +0,0 @@
-- association_state_machines = object.send("#{association.name}_state_machines")
-%table.table.table-striped.table-bordered
-  - object.send(association.name)&.each do |association_object|
-    %tr{ id: "#{association.name}_#{association_object.id}" }
-      %td
-        = association_object.id
-      %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 }
-      %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
-            = fa_icon 'pencil-alt'
-        - if destroy_is_available? association_object, object
-          = delete_button url: record_path(association_object.id, model: association.options[:class_name], redirect: current_model_record_path(object.id)), button_options: { class: 'btn btn-xs btn-danger delete' } do
-            = fa_icon 'trash-alt'
-        - if habtm_destroy_is_available? association_object, object
-          = delete_button url: has_and_belongs_to_many_record_path(association_object.id, model_class: object.model.class, object_id: object.id, form: "Admin::#{object.model.class.to_s.pluralize}::Remove#{association_object.model.class.to_s}Form", redirect: current_model_record_path(object.id)), button_options: { class: 'btn btn-xs btn-danger delete' } do
-            = fa_icon 'trash-alt'