tramway-admin 1.26.1.3 → 1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 478a7c86513ae6f6ad86450d01de8dbf2a4d94a546139c9ec45c6b9c9fe38095
-  data.tar.gz: 44d0ac0409b9443cd633800f0daf9aa2693e892dcd9f460f8389c070ab152c25
+  metadata.gz: 60b354696526340affbff03705102d68483b44d47961a4a8670b7c31e83fcb44
+  data.tar.gz: 5eb95f5f0ff81ebf58943bf158fd95b72d45bf92fb001a656db86bcb746d82a5
 SHA512:
-  metadata.gz: 35e5136e3916c892f3ad5f31a84d92ad95fb7fb1df0b14aaf646cab6a439461f011f945c633e3ca26bc62d06fc48da4524f26dfabd3e9d4b229e5d24e93929e1
-  data.tar.gz: 63a20290bcbdf8fe72d511aa413f2b43a45e3f5b38579c0960b2a3e89ca8a912597dcc3077c0baf33dc6f1ac76bfb917b4ea3ea5bd07c3010745f0d359f87927
+  metadata.gz: ceb8b3016c5aa58f01e55841670dae17bb547ef05c4b82bf567ba624cc6a9221348fbc3542e61b02813a6beb5c7e9fc003cecd5ed1d5b0a3221f3b7d462470d8
+  data.tar.gz: b7783ff8430c982ae818c0bd8fb2e74ae91b90b3fab8d7bcfef083d6cd1c21b34731ec1be934aeb95fdb23c9e9cf2daa518b14a00eef2fbdd10998bf43cb3931

data/README.md

@@ -202,6 +202,14 @@ To add notification to application, you need just set queries in initializers.
 end
 ```
 
+**NOTE:** Proc with `current_user` argument is expecting. If you don't need `current_user`, just name do something like that:
+
+```ruby
+::Tramway::Admin.set_notificable_queries new_participants: -> (_current_user) do
+  # some code which does not need current_user
+end
+```
+
 ## Admin Main Page management
 
 Start page of admin panel contains only `application.name` by default. To manage it just set `Tramway::Admin.welcome_page_actions` with some lambda and set `@content` variable with HTML.

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

@@ -21,7 +21,7 @@ module Tramway
       protected
 
       def check_available!
-        raise 'Model is not available' unless model_given?
+        raise 'Model or Form is not available' if !model_given? && !form_given?
       end
 
       def check_available_scope!
@@ -68,7 +68,7 @@ module Tramway
       include Tramway::ClassNameHelpers
 
       def model_class
-        model_class_name(params[:model])
+        model_class_name(params[:model] || params[:form])
       end
 
       def decorator_class
@@ -83,6 +83,10 @@ module Tramway
         available_models_given? || singleton_models_given?
       end
 
+      def form_given?
+        Tramway::Admin.forms.include? params[:form].underscore.sub(/^admin\//, '').sub(/_form$/, '')
+      end
+
       def available_scope_given?
         params[:scope].present? && params[:scope].in?(decorator_class.collections.map(&:to_s))
       end

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

@@ -0,0 +1,21 @@
+class Tramway::Admin::HasAndBelongsToManyRecordsController < ::Tramway::Admin::ApplicationController
+  def create
+    base_object = params[:model_class].constantize.find params[:object_id]
+    record_form = params[:form].constantize.new base_object
+    if record_form.submit params[params[:model_class].underscore]
+      redirect_to params[:redirect].present? ? params[:redirect] : record_path(base_object, model: base_object.class)
+    else
+      redirect_to params[:redirect].present? ? params[:redirect] : record_path(base_object, model: base_object.class)
+    end
+  end
+
+  def destroy
+    base_object = params[:model_class].constantize.find params[:object_id]
+    record_form = params[:form].constantize.new base_object
+    if record_form.submit params[:id]
+      redirect_to params[:redirect].present? ? params[:redirect] : record_path(base_object, model: base_object.class)
+    else
+      redirect_to params[:redirect].present? ? params[:redirect] : record_path(base_object, model: base_object.class)
+    end
+  end
+end

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

@@ -4,6 +4,6 @@ class Tramway::Admin::WelcomeController < Tramway::Admin::ApplicationController
   skip_before_action :check_available!
 
   def index
-    self.instance_exec(&::Tramway::Admin.welcome_page_actions) if ::Tramway::Admin.welcome_page_actions.present?
+    instance_exec(&::Tramway::Admin.welcome_page_actions) if ::Tramway::Admin.welcome_page_actions.present?
   end
 end

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

@@ -0,0 +1,15 @@
+module Tramway::Admin::ActionsHelper
+  def destroy_is_available?(association_object, main_object)
+    ::Tramway::Admin.action_is_available?(
+      association_object,
+      project: (@application_engine || @application.name),
+      model: association_object.model.class,
+      role: current_user.role,
+      action: :destroy
+    ) 
+  end
+
+  def habtm_destroy_is_available?(association_object, main_object)
+    ::Tramway::Admin.forms.include?("#{main_object.model.class.to_s.underscore.pluralize}/remove_#{association_object.model.class.to_s.underscore}")
+  end
+end

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

@@ -14,6 +14,7 @@ module Tramway
       include ::Tramway::Admin::NavbarHelper
       include ::Tramway::Admin::InputsHelper
       include ::Tramway::Admin::FocusGeneratorHelper
+      include ::Tramway::Admin::ActionsHelper
       include ::Tramway::Collections::Helper
       include ::Tramway::Core::CopyToClipboardHelper
 

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

@@ -26,6 +26,8 @@
       - 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_one).each do |association|
-      = render 'tramway/admin/shared/show/associations', object: object, association: association
+      = render 'tramway/admin/shared/show/associations/row', object: object, association: association
     - object.associations(:has_many).each do |association|
-      = render 'tramway/admin/shared/show/associations', object: object, association: association
+      = render 'tramway/admin/shared/show/associations/row', object: object, association: association
+    - object.associations(:has_and_belongs_to_many).each do |association|
+      = render 'tramway/admin/shared/show/associations/habtm_row', object: object, association: association

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

@@ -0,0 +1,11 @@
+- if object.class.show_associations.map(&:to_s).include? association.name.to_s
+  %tr
+    %td
+      = model_class.human_attribute_name association.name
+      %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'
+    %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,18 @@
+- 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 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/_row.html.haml

@@ -0,0 +1,8 @@
+- if object.class.show_associations.map(&:to_s).include? association.name.to_s
+  %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'
+    %td{ colspan: 2 }
+      = render 'tramway/admin/shared/show/associations/list', object: object, association: association

data/config/routes.rb

@@ -8,4 +8,5 @@ Tramway::Admin::Engine.routes.draw do
 
   resources :records
   resource :singleton, only: %i[new create show edit update]
+  resources :has_and_belongs_to_many_records, only: [ :create, :destroy]
 end

data/lib/tramway/admin.rb

@@ -3,6 +3,7 @@
 require 'tramway/admin/engine'
 require 'tramway/admin/singleton_models'
 require 'tramway/admin/records_models'
+require 'tramway/admin/forms'
 require 'tramway/admin/additional_buttons'
 require 'tramway/admin/notifications'
 require 'tramway/admin/welcome_page_actions'
@@ -17,6 +18,7 @@ module Tramway
       include ::Tramway::Admin::RecordsModels
       include ::Tramway::Admin::SingletonModels
       include ::Tramway::Admin::AdditionalButtons
+      include ::Tramway::Admin::Forms
       include ::Tramway::Admin::Notifications
       include ::Tramway::Admin::WelcomePageActions
       include ::Tramway::Admin::Navbar
@@ -55,7 +57,7 @@ module Tramway
         return false unless availability.present?
         return true if availability.is_a? Symbol
 
-        return availability.values.first.call record
+        availability.values.first.call record
       end
 
       def select_actions(project:, role:, model:)

data/lib/tramway/admin/forms.rb

@@ -0,0 +1,3 @@
+module Tramway::Admin::Forms
+  attr_accessor :forms
+end

data/lib/tramway/admin/navbar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway::Admin::Navbar
   def navbar_structure(*links)
     @navbar_structure ||= links

data/lib/tramway/admin/records_models.rb

@@ -7,7 +7,7 @@ module Tramway::Admin::RecordsModels
     @available_models[project][role] ||= {}
     models.each do |model|
       if model.class == Class
-        @available_models[project][role].merge! model => [ :index, :show, :update, :create, :destroy ]
+        @available_models[project][role].merge! model => %i[index show update create destroy]
       elsif model.class == Hash
         @available_models[project][role].merge! model
       end

data/lib/tramway/admin/singleton_models.rb

@@ -7,7 +7,7 @@ module Tramway::Admin::SingletonModels
     @singleton_models[project][role] ||= {}
     models.each do |model|
       if model.class == Class
-        @singleton_models[project][role].merge! model => [ :index, :show, :update, :create, :destroy ]
+        @singleton_models[project][role].merge! model => %i[index show update create destroy]
       elsif model.class == Hash
         @singleton_models[project][role].merge! model
       end

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.26.1.3'
+    VERSION = '1.27'
   end
 end

data/lib/tramway/admin/welcome_page_actions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Admin
     module WelcomePageActions

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.26.1.3
+  version: '1.27'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-05 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
@@ -181,10 +181,12 @@ files:
 - app/assets/javascripts/tramway/admin/focus.js
 - app/assets/stylesheets/tramway/admin/application.sass
 - app/controllers/tramway/admin/application_controller.rb
+- app/controllers/tramway/admin/has_and_belongs_to_many_records_controller.rb
 - app/controllers/tramway/admin/records_controller.rb
 - app/controllers/tramway/admin/singletons_controller.rb
 - app/controllers/tramway/admin/welcome_controller.rb
 - app/controllers/tramway/export/application_controller.rb
+- app/helpers/tramway/admin/actions_helper.rb
 - app/helpers/tramway/admin/additional_buttons_builder.rb
 - app/helpers/tramway/admin/application_helper.rb
 - app/helpers/tramway/admin/cases_helper.rb
@@ -209,8 +211,10 @@ 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/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/singletons/_form.html.haml
 - app/views/tramway/admin/singletons/edit.html.haml
 - app/views/tramway/admin/singletons/new.html.haml
@@ -229,6 +233,7 @@ files:
 - lib/tramway/admin.rb
 - lib/tramway/admin/additional_buttons.rb
 - lib/tramway/admin/engine.rb
+- lib/tramway/admin/forms.rb
 - lib/tramway/admin/navbar.rb
 - lib/tramway/admin/notifications.rb
 - lib/tramway/admin/record_routes_helper.rb

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

@@ -1,22 +0,0 @@
-- if object.class.show_associations.map(&:to_s).include? association.name.to_s
-  %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'
-    - association_state_machines = object.send("#{association.name}_state_machines")
-    %td{ colspan: 2 }
-      %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 ::Tramway::Admin.action_is_available?(association_object, project: (@application_engine || @application.name), model: association_object.model.class, role: current_user.role, action: :destroy)
-                = 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'