tramway-admin 1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f958353c638d04e501d274aaf555084edd43630474d63d5a7682f7a6b8565da7
-  data.tar.gz: 270474b2cbe1394790cbc4a6346737186c204dd03d750025adb2158946c418d0
+  metadata.gz: 82b79fa9390f6866be725ce3cdc095b6158456571462b860be1de9b7115cda00
+  data.tar.gz: 8cc8e23372e075cff26512f3193eeb5c715b85135a871860038d4d4b55b9cb4b
 SHA512:
-  metadata.gz: 4ca5455bd4191f663f6186e007d93f53f8fd9c2eb68289a8d409756bc75c2ad6bbee1f56781d9df2789585a94d53d56a2f5aca164546990a4deb01c2aeb396d2
-  data.tar.gz: b0a7c65aed9447ebe1171445b832946bdca147d3721f7f098f44cbc221502dc66ef82e925b7f198dc55a980c509792a3a0532c69b69ba6347756d1457d8b4edd
+  metadata.gz: 8604bf514e0c54656ad2039112710aa15627ba7b316d10b7261c6ebf6a3a79af406152d37d02ce8d5649fa9fdb7e3af24c121acaec77ff9d1e52f56909fcf827
+  data.tar.gz: d22e39c639b3371864436a09e7fe7965cc4bb598793378c6c864024a18ec8ab38507c61df318385c93dc2b8032c2c78ae4a39ed9da59a33d84d9bff9cb593a49

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

@@ -1,13 +1,28 @@
 module Tramway::Admin
   class SingletonsController < ApplicationController
     def show
-      @singleton = decorator_class.decorate model_class.active.first
+      if model_class.active.first.present?
+        @singleton = decorator_class.decorate model_class.active.first
+      else
+        @singleton_form = form_class.new model_class.new
+        render :new
+        return
+      end
     end
 
     def edit
       @singleton_form = form_class.new model_class.active.first
     end
 
+    def create
+      @singleton_form = form_class.new model_class.new
+      if @singleton_form.submit params[:singleton]
+        redirect_to params[:redirect] || singleton_path(model: params[:model])
+      else
+        render :edit
+      end
+    end
+
     def update
       @singleton_form = form_class.new model_class.active.first
       if @singleton_form.submit params[:singleton]

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

@@ -1,18 +1,20 @@
 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
-      )
+    if 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
     end
     return
   end

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

@@ -5,6 +5,8 @@ module Tramway
       include AuthManagment
       include AdditionalButtonsBuilder
       include RussianCasesHelper
+      include ::Tramway::Admin::RecordsHelper
+      include ::Tramway::Admin::SingletonHelper
 
       def title(page_title = default_title)
         title_text = "#{page_title} | #{t('application.name')}"

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

@@ -0,0 +1 @@
+= render partial: 'form', locals: { action: :create }

data/config/routes.rb

@@ -4,5 +4,5 @@ Tramway::Admin::Engine.routes.draw do
   root to: 'welcome#index'
 
   resources :records
-  resource :singleton, only: [ :show, :edit, :update ]
+  resource :singleton, only: [ :new, :create, :show, :edit, :update ]
 end

data/lib/tramway/admin.rb

@@ -43,7 +43,7 @@ module Tramway
         @additional_buttons[project].merge! buttons
       end
 
-      def additional_buttons(project:, view: nil, record: nil)
+      def additional_buttons(view: nil, record: nil)
         @additional_buttons&.dig record, view
       end
 

data/lib/tramway/admin/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Admin
-    VERSION = '1.2'
+    VERSION = '1.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.2.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-21 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-user
@@ -176,6 +176,7 @@ files:
 - app/views/tramway/admin/records/show.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
 - app/views/tramway/admin/singletons/show.html.haml
 - app/views/tramway/admin/welcome/index.html.haml
 - config/initializers/assets.rb