tramway-admin 1.0.1 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ede3dd0927c3ca2efff6c3099adc8feb5967bda5e7ec26e5c76a7ae38fd8507c
-  data.tar.gz: 56c36d25bbfe1e535f0dd438470cb5f55bb49cc2b25a4b1d5401c280cfc67946
+  metadata.gz: 9b509f3137e389c0d20cc54056cb16f683ef6077c3252b1573caf4e019f6f180
+  data.tar.gz: a352f3c1e83c8f44cd2f66f0ade79fa1a45f94294e623f8305209668215e7e4e
 SHA512:
-  metadata.gz: 57d3936c3fb37f8b2998f820b0533c9102996bd7d4bf2eb8ffaf685ac1a32b765fc98a679c288d1edb4365650d7c61635ea88ea50eed00326456bcdd5977ec16
-  data.tar.gz: d11ece18b797fd1cf74b52dc8e76295c18c2b681d4678d08ea6b7de6d8397b3ec3d9aea7908602d500d5971477a6442784c847f2e3cae9e2a5deeef19950f7e6
+  metadata.gz: 3d24fe1df7c7e20f1ccb33c2b69ff4b829306a555a917f37051e1700d9d7f6c5e5fba6729db5514af92cbfb0ad4c603c9bbe8a2d3330cf9083c57d20845a9392
+  data.tar.gz: 1fd49a015741a643f236c16969d6e0eeec79441a7dff0e269f8578a3ce353a138a13e28a42f71275bdf0a286e41d7e9cfd578da2006308b429d9a3b6df65b2bb

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

@@ -0,0 +1,53 @@
+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|
+      concat(
+        link_to(
+          send(
+            "#{button[:action]}_record_path",
+            build_params(button[:params]).merge(model: button[:model_name])
+          ),
+          class: "btn btn-#{button_color(button[:action])} btn-xs"
+        ) do
+          button[:text] || button_icon(button[:action])
+        end
+      )
+    end
+    return
+  end
+
+  private
+
+  BUTTON_STYLES = {
+    new: { color: :success, icon: :plus },
+    create: { color: :success, icon: :plus },
+    edit: { color: :warning, icon: :pencil },
+    update: { color: :warning, icon: :pencil },
+    delete: { color: :danger, icon: :remove }
+  }
+
+  def button_color(action)
+    BUTTON_STYLES[action][:color]
+  end
+
+  def button_icon(action)
+    BUTTON_STYLES[action][:icon]
+  end
+
+  def build_params(params)
+    param = {}
+    record = @record || @singleton
+    params.each do |model_name, model_attributes|
+      attributes = {}
+      model_attributes.each do |name, value|
+        if value.is_a? Proc
+          value = record.model.instance_exec(&value)
+        end
+        attributes.merge! name => value
+      end
+      param.merge! model_name => attributes
+    end
+    param
+  end
+end

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

@@ -3,6 +3,7 @@ module Tramway
     module ApplicationHelper
       include ::FontAwesome::Rails::IconHelper
       include AuthManagment
+      include AdditionalButtonsBuilder
 
       def title(page_title = default_title)
         title_text = "#{page_title} | #{t('application.name')}"

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

@@ -1,20 +1,20 @@
 module Tramway::Admin
   module RecordsHelper
     # FIXME replace to module
-    def record_path(*args, **options)
-      super args, options.merge(model: params[:model])
+    def current_model_record_path(*args, **options)
+      record_path args, options.merge(model: params[:model])
     end
 
-    def edit_record_path(*args, **options)
-      super args, options.merge(model: params[:model])
+    def edit_current_model_record_path(*args, **options)
+      edit_record_path args, options.merge(model: params[:model])
     end
 
-    def new_record_path(*args, **options)
-      super args, options.merge(model: params[:model])
+    def new_current_model_record_path(*args, **options)
+      new_record_path args, options.merge(model: params[:model])
     end
 
-    def records_path(*args, **options)
-      super args, options.merge(model: params[:model])
+    def current_model_records_path(*args, **options)
+      records_path args, options.merge(model: params[:model])
     end
 
     def model_class

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

@@ -1,10 +1,10 @@
 module Tramway::Admin::SingletonHelper
   # FIXME replace to module
-  def singleton_path(*args, **options)
-    super args, options.merge(model: params[:model])
+  def current_model_singleton_path(*args, **options)
+    singleton_path args, options.merge(model: params[:model])
   end
 
-  def edit_singleton_path(*args, **options)
-    super args, options.merge(model: params[:model])
+  def edit_current_model_singleton_path(*args, **options)
+    edit_singleton_path args, options.merge(model: params[:model])
   end
 end

data/app/views/layouts/tramway/admin/application.html.haml

@@ -13,7 +13,11 @@
   %body
     = render 'layouts/tramway/admin/shared/navbar'
     %main.container{ role: :main }
-      = yield
+      .row
+        .col-lg-9
+          = yield
+        .col-lg-3.sidebar-canvas
+          = yield :sidebar
     %footer
       .container
         = copyright '2017', 'Tramway'

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

@@ -10,9 +10,10 @@
   .col-lg-12
     = simple_form_for @record_form.model, url: { controller: :records, action: action, model: @record_form.model.class }, input_html: { class: 'form-horizontal' } do |f|
       - @record_form.properties.each do |property, type|
+        - value = params.dig(model_class.to_s.underscore, property.to_s)
         - if type == :default
-          = f.input property, input_html: { name: "record[#{property}]", id: "record_#{property}" } 
+          = f.input property, input_html: { name: "record[#{property}]", id: "record_#{property}", value: value }, selected: value
         - else
-          = f.input property, as: type, input_html: { name: "record[#{property}]", id: "record_#{property}" } 
+          = f.input property, as: type, input_html: { name: "record[#{property}]", id: "record_#{property}", value: value } 
       = f.button :submit, t('helpers.links.save'), class: 'btn-success'
-      = link_to t('helpers.links.back'), records_path, class: 'btn btn-secondary'
+      = link_to t('helpers.links.back'), current_model_records_path, class: 'btn btn-secondary'

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

@@ -11,9 +11,9 @@
     - @records.each do |record|
       %tr
         %td
-          = link_to record.id, record_path(record.id)
+          = link_to record.id, current_model_record_path(record.id)
         %td
-          = link_to record.name, record_path(record.id)
+          = link_to record.name, current_model_record_path(record.id)
         - decorator_class.list_attributes.each do |attribute|
           %td
             = record.send attribute
@@ -21,7 +21,7 @@
           .btn-group{ data: { toggle: :buttons } }
             - record.model.class.state_machines.keys.each do |state_method|
               - unless state_method == :state
-                = state_events_buttons record, state_method: state_method, model_param_name: :record, route_method: :record_path, parameters: { redirect: records_path }
-          = link_to fa_icon(:pencil), edit_record_path(record.id), class: 'btn btn-warning btn-xs'
-          = link_to fa_icon(:remove), record_path(record.id), method: :delete, class: 'btn btn-xs btn-danger'
+                = state_events_buttons record, state_method: state_method, model_param_name: :record, route_method: :current_model_record_path, parameters: { redirect: current_model_records_path }
+          = link_to fa_icon(:pencil), edit_current_model_record_path(record.id), class: 'btn btn-warning btn-xs'
+          = link_to fa_icon(:remove), current_model_record_path(record.id), method: :delete, class: 'btn btn-xs btn-danger'
 = paginate @records, theme: 'twitter-bootstrap-4'

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

@@ -3,13 +3,12 @@
 - title current_title
 - state_method ||= :state
 - tabs = get_collection model_class
-- new_path = "new_admin_#{to_path(model_class)}_path"
 .page-header
   .row
     .col-md-6
       %h1
         = current_title
-        = link_to fa_icon(:plus), new_record_path, class: 'btn btn-primary'
+        = link_to fa_icon(:plus), new_current_model_record_path, class: 'btn btn-primary'
     = render 'search', model_class: model_class
 %hr
 %ul.nav.nav-tabs

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

@@ -7,6 +7,7 @@
       %h1
         = current_title
         = link_to fa_icon(:pencil), edit_record_path(@record.id), class: 'btn btn-warning btn-xs'
+        = ::Tramway::Admin.additional_buttons(record: @record.model.model_name, view: :show)
 %hr
 .row
   %table.table.table-striped.table-bordered

data/app/views/tramway/admin/singletons/show.html.haml

@@ -1,12 +1,16 @@
 - default_page_title ||= nil; on_site_link ||= nil
 - current_title = default_page_title || model_class.model_name.human.pluralize(:ru)
 - title current_title
+
+= content_for :sidebar do
+  .btn-group-vertical
+    = build_buttons ::Tramway::Admin.additional_buttons(record: @singleton.model.class.to_s, view: :show)
 .page-header
   .row
     .col-md-6
-      %h1
+      %h2
         = current_title
-        = link_to fa_icon(:pencil), edit_singleton_path, class: 'btn btn-warning btn-xs'
+        = link_to fa_icon(:pencil), edit_current_model_singleton_path, class: 'btn btn-warning btn-xs'
 %hr
 .row
   %table.table.table-striped.table-bordered

data/lib/tramway/admin.rb

@@ -25,6 +25,15 @@ module Tramway
       def singleton_models
         @singleton_models
       end
+
+      def set_additional_buttons(buttons)
+        @additional_buttons ||= {}
+        @additional_buttons.merge! buttons
+      end
+
+      def additional_buttons(view: nil, record: nil)
+        @additional_buttons&.dig record, view
+      end
     end
   end
 end

data/lib/tramway/admin/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Admin
-    VERSION = '1.0.1'
+    VERSION = '1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: '1.1'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies: []
 description: Engine for admin
 email:
@@ -32,6 +32,7 @@ files:
 - app/controllers/tramway/admin/records_controller.rb
 - app/controllers/tramway/admin/singletons_controller.rb
 - app/controllers/tramway/admin/welcome_controller.rb
+- app/helpers/tramway/admin/additional_buttons_builder.rb
 - app/helpers/tramway/admin/application_helper.rb
 - app/helpers/tramway/admin/records_helper.rb
 - app/helpers/tramway/admin/russian_cases_helper.rb