tramway-admin 1.11.0.1 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5a2a917c26543b66a2e6373da1c9c9fed2e1517dea45f3fd75184407779a84
-  data.tar.gz: f307a2a294a5f093c9f6d0205ec8cb73d7d31901dbc0d963305d84b87a642a8f
+  metadata.gz: e0b72f16b791b5f4e02438b86c0158f146f67ec8c669e76f8394cfb8d2755b6a
+  data.tar.gz: 1fe10f082766bc7965a9457413093244a8e93c01c2317c7c163eb877ecfabab4
 SHA512:
-  metadata.gz: ecbc2ab0fcc75e7f687b1091e776b7ad9d1dc21a9a341af9869817fd82465f9ad8862d9397e46d81db137616d95ec44f5cf4221f9fbb4ec6fdfe87cf90d2f716
-  data.tar.gz: de1d46d1b7d59882b3ba729195f35e61d21197bf60e921b5a30c4d33777848096d9007b94d7dbd6be30690ab4394e1104de07743c92a1718c6dffe4ab7eaef89
+  metadata.gz: 6576cc72537fe1db1c5e3d174d16ef35d9e36204ee65fac8443432f714bdb8aa2c5be1553a6a7cd7cf1e8a118b47d319851a765a8fde5ca83435842dffa52bbf
+  data.tar.gz: 4d6c24eeb41db4922aba8800d04a04e65769d16182e8d686e804b069ec71103d0523d8360bd43e0bc280b9995c7cf4c55c243e71dd5f261ca5703a7bb65d4e16

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

@@ -20,19 +20,8 @@
       - object.class.show_attributes.each do |attribute_name|
         - value = object.send attribute_name
         = render 'tramway/admin/shared/show/attribute_tr', attribute_name: attribute_name, value: value, object: object
+      = render 'tramway/admin/shared/show/associations', object: object
     - else
       - object.attributes.each do |attribute_name, value|
         = render 'tramway/admin/shared/show/attribute_tr', attribute_name: attribute_name, value: value, object: object
-      - object.associations(:has_many).each do |association|
-        %tr
-          %td
-            = model_class.human_attribute_name association.name
-            = link_to fa_icon(:plus), new_record_path(model: association.class_name, redirect: current_model_record_path(object)), class: 'btn btn-primary'
-          %td{ colspan: 2 }
-            %table.table.table-striped.table-bordered
-              - object.send(association.name).each do |association_object|
-                %tr
-                  %td
-                    = association_object.id
-                  %td
-                    = association_object.name
+      = render 'tramway/admin/shared/show/associations', object: object

data/app/views/tramway/admin/shared/show/_associations.html.haml

@@ -0,0 +1,13 @@
+- object.associations(:has_many).each do |association|
+  %tr
+    %td
+      = model_class.human_attribute_name association.name
+      = link_to fa_icon(:plus), new_record_path(model: association.class_name, redirect: current_model_record_path(object)), class: 'btn btn-primary'
+    %td{ colspan: 2 }
+      %table.table.table-striped.table-bordered
+        - object.send(association.name).each do |association_object|
+          %tr
+            %td
+              = association_object.id
+            %td
+              = link_to association_object.name, record_path(association_object.id, model: 'Project')

data/app/views/tramway/admin/shared/show/_attribute_tr.html.haml

@@ -4,5 +4,5 @@
   %td
     = value
   %td
-    - if attribute_name != 'state' && object.model.class.state_machines.keys.include?(attribute_name.to_sym)
+    - if attribute_name.to_s != 'state' && object.model.class.state_machines.keys.include?(attribute_name.to_sym)
       = state_events_buttons object, state_method: attribute_name, model_param_name: :record, route_method: :current_model_record_path

data/lib/tramway/admin/record_routes_helper.rb

@@ -2,19 +2,23 @@ module Tramway
   module Admin
     module RecordRoutesHelper
       def record_path(*args, **options)
-        super args, options.merge(model: params[:model])
+        options[:model] ||= params[:model]
+        super args, options
       end
 
       def edit_record_path(*args, **options)
-        super args, options.merge(model: params[:model])
+        options[:model] ||= params[:model]
+        super args, options
       end
 
       def new_record_path(*args, **options)
-        super args, options.merge(model: params[:model])
+        options[:model] ||= params[:model]
+        super args, options
       end
 
       def records_path(*args, **options)
-        super args, options.merge(model: params[:model])
+        options[:model] ||= params[:model]
+        super args, options
       end
     end
   end

data/lib/tramway/admin/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Admin
-    VERSION = '1.11.0.1'
+    VERSION = '1.11.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.11.0.1
+  version: 1.11.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-29 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
@@ -234,6 +234,7 @@ files:
 - app/views/tramway/admin/shared/_input.html.haml
 - app/views/tramway/admin/shared/_show.html.haml
 - app/views/tramway/admin/shared/errors/server_error.html.haml
+- app/views/tramway/admin/shared/show/_associations.html.haml
 - app/views/tramway/admin/shared/show/_attribute_tr.html.haml
 - app/views/tramway/admin/singletons/_form.html.haml
 - app/views/tramway/admin/singletons/edit.html.haml