tramway-admin 2.1.1.1 → 2.1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e197dfec025062fc017b4e359c9736887c0a58a22e40e2fcb52cbd5f5476e04
-  data.tar.gz: ad1aac188a7d3ba683efda4f4f9b3f4960f4de96f473c7f8e99b60937ad90ebd
+  metadata.gz: aeabc39d2bc0ce9ea3504bf578a0016a46e6278cbb27cdfbe8f393bf68f482fd
+  data.tar.gz: 6d65c6e3b06f0b6ef86a285a7dad3bbd713eaa7cecb72d0440be493f8381eb88
 SHA512:
-  metadata.gz: ba6ae3d8e3d43eb259cb863657ebbf27efc63edbefe64330775addea6ec64320f7891142c98439a8623e1118764fceb5f33b536b628ddb16689d1bb38cb45e68
-  data.tar.gz: 1433dcc937e3b36753a64277bd4d714b1ee8db440fc2a401c662ff33ce7308d1c8169338105533d0120bbbb8fd5a0cb10d1ecef7624fbc90881346012d78b7d0
+  metadata.gz: 900820722317c55bcc7cafb5a64632d75af778e91a6009b7edcc6dbf8a19ba6a6c5a21bbc18af6037f71e8a839d844fec7a244b4e0964758dea0b8f47cbdff98
+  data.tar.gz: 36830caf1c44bba27810e610cda58030470511dd2c8c854ff0e10ce7a9fc6d5b5aa47e4cc70686e6ced584743d934abda6cae0d3956e2d1f3f8f02226f858b6f

data/app/assets/javascripts/tramway/admin/application.js

@@ -1,7 +1,6 @@
 //= require tramway/core/application
 //= require jquery
 //= require jquery_ujs
-//= require popper
 //= require bootstrap-sprockets
 //= require ckeditor/init
 //= require selectize
@@ -10,4 +9,7 @@
 
 $(document).ready(function() {
   let clipboard = new Clipboard('.clipboard-btn');
+  $(function () {
+    $('[data-toggle="popover"]').popover()
+  })
 })

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

@@ -9,7 +9,7 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
       if params[:filter].is_a? String
         params[:filter] = JSON.parse params[:filter]
       end
-      records = records.ransack(params[:filter]).result 
+      records = records.ransack(params[:filter]).result(distinct: true)
     end
     params[:list_filters]&.each do |filter, value|
       case decorator_class.list_filters[filter.to_sym][:type]

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

@@ -5,7 +5,10 @@
       %hr
       - association_form = object.send("add_#{association.name}_form")
       = simple_form_for association_form, url: { controller: :has_and_belongs_to_many_records, action: :create, form: association_form.class, model_class: model_class, object_id: object.id }, method: :post do |f|
-        = f.association association_form.associations.first, label: false
-        = f.button :submit, "#{I18n.t('helpers.actions.add')} #{model_class.human_attribute_name(association.name).singularize.downcase}", class: 'btn-success'
+        - association_form.associations.each do |association_name|
+          - associations = association_form.model.class.reflect_on_all_associations.map(&:name)
+          - if associations.include? association_name
+            = f.association association_name, label: false
+            = f.button :submit, "#{I18n.t('helpers.actions.add')} #{model_class.human_attribute_name(association.name).singularize.downcase}", class: 'btn-success'
     %td{ colspan: 2 }
       = render 'tramway/admin/shared/show/associations/list', object: object, association: association

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

@@ -0,0 +1,21 @@
+- 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'

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

@@ -1,4 +1,3 @@
-- association_state_machines = AASM::StateMachineStore.fetch(association_object.model.class).machine_names - ['default']
 - 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.1.1'
+    VERSION = '2.1.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 2.1.1.1
+  version: 2.1.3.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core
@@ -278,6 +278,7 @@ 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
@@ -329,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Engine for admin