tramway-admin 2.0.0.4 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 632e5dd43c0a3314fabad57036952dc28b1076c332f9d34c88469db3615a70dc
-  data.tar.gz: 9efd54aee213e9bed5d867f2b64eec6ed049702b26d3aacb36208a329d7a881b
+  metadata.gz: efe8998e6d28614e1a7bf88a24ac91cd9635c807db0b1f14c912df66c94bf663
+  data.tar.gz: 4f142c6de6479a892b88b60a29017c7cf791e0c2943e1c8fbb0b038ff279e93c
 SHA512:
-  metadata.gz: f4ffb4e002ea169573c72e5b14719323e9366d232c68282ab40354fda312109bc9cb7cb042ed5caafeabb39340cc5553e6021b1a3bbe23f45f4bdc1a7487ddb9
-  data.tar.gz: 223ab421a92f7cd80cc83728736e918440d64fa77e6c902bf77a5e1cc38c6702b882412ca9ad5109457c75104e1d1e8a4719e6f2eb11928a5add7826b4ad2b9d
+  metadata.gz: f1187272662360971342253d641daf9b8ab27e218bea93f68b7dda3505bd791ad1d38872c18aea7fa607e8bf1be9d2b1bb4fe1ea4d8fdce96834d4262d66df46
+  data.tar.gz: 53b6d3b617ebbf6b53747d6e56b523fe252466654847902b2735a05969a4a23ff95af6ae08537426ccd46c3471ecaf95fd889ea34e8146b3eb57a7c1a6bb417b

data/README.md

@@ -526,6 +526,29 @@ en:
         my_dropdown: Very important dropdown
 ```
 
+## Additional buttons to the show view
+
+You can additional buttons to the header of show view of your model. Just add its configuration to the decorator
+
+*app/decorators/your_model_decorator.rb*
+```ruby
+class YourModelDecorator < Tramway::Core::ApplicationDecorator
+  def additional_buttons
+    {
+      show: [ # means that this buttons will be shown on show view only
+        {
+          url: ::Tramway::Export::Engine.routes.url_helpers.export_path(object.id, model: object.class, collection: :tasks),
+          inner: lambda do # inner HTML you want to see in the button
+            fa_icon 'file-excel'
+          end,
+          color: :success # bootstrap button color
+        }
+      ]
+    }
+  end
+end
+```
+
 ## Errors
 
 * **Model or Form is not available** - `params[:model]` or `params[:form]` is empty **OR** current user does not have access to model or form in `params[:model]` or `params[:form]`

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

@@ -1,17 +1,11 @@
 # frozen_string_literal: true
 
 module Tramway::Admin::AdditionalButtonsBuilder
-  def build_buttons(additional_buttons)
-    additional_buttons = additional_buttons.is_a?(Hash) ? [additional_buttons] : additional_buttons
-    additional_buttons.each do |button|
-      options = button[:options] || {}
-      concat(
-        link_to(
-          button[:url], method: button[:method], class: "btn btn-#{button[:color]} btn-xs", **options
-        ) do
-          button[:text]
-        end
-      )
-    end
+  def build_button(button)
+    options = button[:options] || {}
+    style = 'margin-right: 8px'
+    concat(link_to(button[:url], method: button[:method], class: "btn btn-#{button[:color]} btn-xs", style: style, **options) do
+      button[:inner]&.call
+    end)
   end
 end

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

@@ -1,11 +1,6 @@
 - default_page_title ||= nil; on_site_link ||= nil
 - current_title = default_page_title || "#{object.name} | #{model_class.model_name.human.pluralize(:ru)}"
 - title current_title
--#= content_for :sidebar do
--#  - buttons = ::Tramway::Admin.additional_buttons(record: object.model.class, view: :show, project: @application.name)
--#  .btn-group-vertical
--#    - buttons.each do |button|
--#      - build_buttons button.call object
 .page-header
   .row
     .col-md-12
@@ -15,9 +10,9 @@
         = link_to fa_icon('pencil-alt'), edit_path, class: 'btn btn-warning btn-xs'
         - if public_path(object)
           = link_to fa_icon(:share), public_path(object), class: 'btn btn-primary btn-xs'
-        - buttons = ::Tramway::Admin.additional_buttons(record: object.model.class, view: :show, project: @application.name)
+        - buttons = object.additional_buttons[:show]
         - buttons&.each do |button|
-          - build_buttons button.call object
+          - build_button button
 %hr
 .row
   %table.table.table-striped.table-bordered

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

@@ -1,16 +1,19 @@
-- if object.class.show_associations.map(&:to_s).include? association.name.to_s
-  - association_type = association.class.to_s.split('::').last.sub(/Reflection$/, '').underscore.to_sym
-  %tr
-    %td
-      = model_class.human_attribute_name association.name
-      %hr
-      - if association_type != :has_one || !object.send(association.name).present?
-        = 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 }
-      - if association_type.in? [ :has_one, :belongs_to ]
-        %table.table.table-striped.table-bordered
-          = render 'tramway/admin/shared/show/associations/table_row', object: object, association: association, association_object: object.send(association.name)
-      - else
-        %table.table.table-striped.table-bordered
-          - object.send(association.name)&.each do |association_object|
-            = render 'tramway/admin/shared/show/associations/table_row', object: object, association: association, association_object: association_object
+- if object.class.show_associations.nil?
+  = "Please, fill show associations method in decorator"
+- else
+  - if object.class.show_associations.map(&:to_s).include? association.name.to_s
+    - association_type = association.class.to_s.split('::').last.sub(/Reflection$/, '').underscore.to_sym
+    %tr
+      %td
+        = model_class.human_attribute_name association.name
+        %hr
+        - if association_type != :has_one || !object.send(association.name).present?
+          = 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 }
+        - if association_type.in? [ :has_one, :belongs_to ]
+          %table.table.table-striped.table-bordered
+            = render 'tramway/admin/shared/show/associations/table_row', object: object, association: association, association_object: object.send(association.name)
+        - else
+          %table.table.table-striped.table-bordered
+            - object.send(association.name)&.each do |association_object|
+              = render 'tramway/admin/shared/show/associations/table_row', object: object, association: association, association_object: association_object

data/lib/tramway/admin.rb

@@ -5,7 +5,6 @@ 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'
 require 'tramway/admin/navbar'
@@ -20,7 +19,6 @@ module Tramway
     class << self
       include ::Tramway::Admin::RecordsModels
       include ::Tramway::Admin::SingletonModels
-      include ::Tramway::Admin::AdditionalButtons
       include ::Tramway::Admin::Forms
       include ::Tramway::Admin::Notifications
       include ::Tramway::Admin::WelcomePageActions

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '2.0.0.4'
+    VERSION = '2.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 2.0.0.4
+  version: 2.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core
@@ -296,7 +296,6 @@ files:
 - config/routes.rb
 - lib/tasks/tramway/admin_tasks.rake
 - lib/tramway/admin.rb
-- lib/tramway/admin/additional_buttons.rb
 - lib/tramway/admin/engine.rb
 - lib/tramway/admin/forms.rb
 - lib/tramway/admin/generators/install_generator.rb
@@ -311,7 +310,7 @@ files:
 - lib/tramway/admin/tramway_model_helper.rb
 - lib/tramway/admin/version.rb
 - lib/tramway/admin/welcome_page_actions.rb
-homepage: https://github.com/kalashnikovisme/tramway-dev
+homepage: https://github.com/purple-magic/tramway-admin
 licenses:
 - MIT
 metadata: {}
@@ -330,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Engine for admin

data/lib/tramway/admin/additional_buttons.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Tramway::Admin::AdditionalButtons
-  def set_additional_buttons(buttons, project:)
-    @additional_buttons ||= {}
-    @additional_buttons[project] ||= {}
-    @additional_buttons[project].merge! buttons
-  end
-
-  def additional_buttons(view: nil, record: nil, project: nil)
-    @additional_buttons&.with_indifferent_access&.dig project, record, view
-  end
-end