tramway-admin 1.20.3 → 1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb01a97126046445dc8cad97bf599ccfba88834d79fcc81f3d4fb9c69dfb88c2
-  data.tar.gz: a721e3e880cb80a0aa1f4de92ec69a0700acabe37a9d9079c48d192066422850
+  metadata.gz: cfb1c6cbf060937418232e7360bb5926e5a77e0dd7b44f629355f4d0a4e1bced
+  data.tar.gz: 8fa7106461c814ebbff02ffb4b84a7c4bbb2ef9d2760872503612e249600b6f6
 SHA512:
-  metadata.gz: 8814ec26d243b314ebe174098446905ebaaf95c1c4cf334f537e4edb14449fd3edbc78568a2e1a168d9121cbed29122d2037379306cc85698b25b25447f3188c
-  data.tar.gz: 5900f6be25d35c92632a22a55ba83fc19c71365da52508f7443a3f9cf1f82920874e1f5571e7d2f8fcb016a34f7f0635ac5c6ea39e531841e15e37a22f9937ab
+  metadata.gz: 4509a00137c9980105509b0a449879c91ef5be45b64f8250dc8cc72a673d632cbdf63869eacc81f3e051ba7c80ba512c967e2fc0d527dea306401cd6fb46065a
+  data.tar.gz: b2b8f2100f1f446fe2047994ffddb3fcb98f989757418a2b8c26aca9a2d37e87052146156ad2c54fdcdc3755d850a1ee47e1e3ff51f25404bede2e40ad72e559

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

@@ -43,6 +43,6 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
   def destroy
     record = model_class.active.find params[:id]
     record.remove
-    redirect_to records_path
+    redirect_to params[:redirect] || records_path
   end
 end

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

@@ -6,7 +6,7 @@ module Tramway
       include ::FontAwesome5::Rails::IconHelper
       include AuthManagement
       include AdditionalButtonsBuilder
-      include SmartButtons
+      include ::SmartButtons
       include CasesHelper
       include RussianCasesHelper
       include ::Tramway::Admin::RecordsHelper

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

@@ -74,12 +74,12 @@ module Tramway::Admin
       return :active if params[:search].nil? && params[:scope].to_s == tab.to_s
     end
 
-    def new_associated_record_path(object:, association:)
+    def new_associated_record_path(object:, association:, as:)
       unless association.options[:class_name].present?
         raise "You should set `class_name` for #{association.name} association"
       end
 
-      if association.options[:as].present?
+      if association.options[:as].present? # polymorphic? conditiion
         new_record_path model: association.class_name,
           redirect: current_model_record_path(object),
           association.options[:class_name].underscore => {
@@ -88,9 +88,9 @@ module Tramway::Admin
           }
       else
         new_record_path model: association.class_name,
-          redirect: current_model_record_path(object),
+          redirect: current_model_record_path(object.model),
           association.options[:class_name].underscore => {
-            object.model.class.name.underscore => object.id
+            as || object.model.class.name.underscore => object.id
           }
       end
     end

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

@@ -11,5 +11,6 @@
     = simple_form_for @record_form, url: { controller: :records, action: action, model: @record_form.model.class }, method: method, input_html: { class: 'form-horizontal' } do |f|
       - @record_form.properties.each do |property, type|
         = render 'tramway/admin/shared/input', property: property, object: :record, type: type, form: f
+      = hidden_field_tag :redirect, params[:redirect]
       = 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/show/_associations.html.haml

@@ -2,7 +2,8 @@
   %tr
     %td
       = model_class.human_attribute_name association.name
-      -#= link_to "Add #{model_class.human_attribute_name(association.name).singularize}", new_associated_record_path(association: association, object: object), class: 'btn btn-primary'
+      %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'
     %td{ colspan: 2 }
       %table.table.table-striped.table-bordered
         - object.send(association.name)&.each do |association_object|
@@ -11,3 +12,6 @@
               = association_object.id
             %td
               = link_to association_object.name, record_path(association_object.id, model: association.options[:class_name])
+            %td
+              = 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' } do
+                = fa_icon 'trash-alt'

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.20.3'
+    VERSION = '1.21'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.20.3
+  version: '1.21'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-25 00:00:00.000000000 Z
+date: 2020-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views