tramway-admin 2.1.1.2 → 2.1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 546beae8f4da6b321d696e39c446439ba17a2ed03de194baf6f2b66aeb603e7d
-  data.tar.gz: bcfc6a18161c2138d83b029ffd057caced1559b6128b85f67989dfcc1c1eb05c
+  metadata.gz: 80721c33dfdeba8fa169d9b695539daa6d60815a75108a1321c8942136e3a3ee
+  data.tar.gz: d4f17bcedd4cfe6113e6ef600d657a7f6761f38e6c9a766047c627aa6238f4ca
 SHA512:
-  metadata.gz: e2b90fa18036b7608b6f931406c17f26f774fc2ee8b675c79c888faeab3cc74091ad4d4e093118e2b265752b06085d7f6a453e0bd17e4bf2f6860621aff586b6
-  data.tar.gz: f4b441e84898e5608ef190ea19a4e1b56b46c189bfe9369774a4a5bb48b4dc98ad2f896057d6fd07e1f0a6d82641146c7eeda098b6872f94ee74bf4e98dd9c58
+  metadata.gz: f75e4b1819128e66cb47c93e103aabd9e829c1741004c79fdaf56db6f5bf0b959e63f7d93a665e854c82080047e40658dd5d2bc4474513f82d89eae2768b132e
+  data.tar.gz: 7a88d91517c5d3ee316b110ff4c14b82811cc68efaaaca61623f4008c51928bf96c7249048007c332b9a1ebd4764659ba821bc9e5e8fd7034e9cf5f1234a8b7c

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/application_controller.rb

@@ -21,7 +21,7 @@ module Tramway
       protected
 
       def check_available!
-        raise 'Tramway::Admin - Model or Form is not available' if !model_given? && !form_given?
+        raise 'Tramway::Admin - Model or Form is not available. Looks like current user does not have access to change this model. Update your tramway initializer file' if !model_given? && !form_given?
       end
 
       def check_available_scope!

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/lib/tramway/admin/preview.rb

@@ -0,0 +1,15 @@
+module Tramway::Admin::Preview
+  def set_previewable_models(*models)
+    @previewable_models ||= []
+    @previewable_models += models.map(&:to_s)
+  end
+
+  def previewable_models
+    @previewable_models
+  end
+
+  def is_available_to_preview?(model_class)
+    @previewable_models ||= []
+    @previewable_models.include? model_class.to_s
+  end
+end

data/lib/tramway/admin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 2.1.1.2
+  version: 2.1.3.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-14 00:00:00.000000000 Z
+date: 2021-10-03 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
@@ -304,6 +305,7 @@ files:
 - lib/tramway/admin/generators/templates/form.rb.erb
 - lib/tramway/admin/navbar.rb
 - lib/tramway/admin/notifications.rb
+- lib/tramway/admin/preview.rb
 - lib/tramway/admin/record_routes_helper.rb
 - lib/tramway/admin/records_models.rb
 - lib/tramway/admin/singleton_models.rb