itsf_backend 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd4ebcdb087ecbe0d465e75228fe8d1b4f79d63d
-  data.tar.gz: 543d6f1f8ca73ce81dcb3f9dd6d56bd8a086d8a8
+  metadata.gz: 0be05c7a7fd7f6d0fb8391a79bd47350b7d9ea00
+  data.tar.gz: 2ecc683d46c48fae5c150dd93a42d6a0c5d7a9b8
 SHA512:
-  metadata.gz: 517f656d121ad0acd302814cc83355f067c29af784927385ef723497baa1eae6cdb2fe68d4bf0a1f92922ff37cfb482bfb8cad1224fe946b9c1f440f05081446
-  data.tar.gz: 596ee97f86f70809e7bbc463655361a9e90032be8da25690de7c27ee68449b6e90b30c065691edbaa2ad0fbc16ed19396281bcdab5da29b6c862dd562e51145d
+  metadata.gz: fb484cf8858f22721a11804340796539a09189bfb7d8acaf5595c14e7aa108b56087d9ccd08192215517c6abc0f4d9cc9305efe78156c7fc8bbfc63d58bb88d8
+  data.tar.gz: dd9deebdf4828fcb22be500b5caeaa027027d8cf35b3088076cf4194f31da6c8a6505a4c369a59f84ef3de6f85cc022d2f785af446bf8ca8417f57bb2bd03b81

data/app/controllers/concerns/controller/rest_actions_concern_with_pundit.rb

@@ -28,7 +28,7 @@ module Controller
       @resource = resource_class.new(permitted_params)
       authorize_action
       @resource.save
-      respond_with @resource, location: collection_path
+      respond_with @resource, location: after_create_location
     end
 
     def show
@@ -47,18 +47,30 @@ module Controller
       @resource = load_resource
       authorize_action
       @resource.update_attributes(permitted_params)
-      respond_with @resource, location: collection_path
+      respond_with @resource, location: after_update_location
     end
 
     def destroy
       @resource = load_resource
       authorize_action
       @resource.destroy
-      respond_with @resource, location: collection_path
+      respond_with @resource, location: after_destroy_location
     end
 
     private
 
+    def after_create_location
+      collection_path
+    end
+
+    def after_destroy_location
+      collection_path
+    end
+
+    def after_update_location
+      collection_path
+    end
+
     def authorize_action
       action = action_name.to_sym
       case action

data/app/controllers/itsf/backend/resource/base_controller.rb

@@ -32,5 +32,19 @@ module Itsf::Backend
     def resource_class
       self.class.resource_class
     end
+
+    private
+
+    def after_create_location
+      return edit_resource_path(@resource) if params.has_key?(:commit_and_continue_with_edit)
+      return new_resource_path if params.has_key?(:commit_and_continue_with_new)
+      collection_path  
+    end
+
+    def after_update_location
+      return edit_resource_path(@resource) if params.has_key?(:commit_and_continue_with_edit)
+      return new_resource_path if params.has_key?(:commit_and_continue_with_new)
+      collection_path  
+    end
   end
 end

data/app/forms/concerns/form/additional_submit_buttons.rb

@@ -0,0 +1,21 @@
+module Concerns
+  module Form
+    module AdditionalSubmitButtons
+      extend ActiveSupport::Concern
+
+      def submit_and_continue_with_edit *args
+        options = args.extract_options!
+        action = object.new_record? ? :create : :update
+        options.merge!(name: 'commit_and_continue_with_edit' ,value: I18n.t("helpers.submit.#{action}_and_continue_with_edit", resource_name: object.model_name.human))
+        submit(options)
+      end
+
+      def submit_and_continue_with_new *args
+        options = args.extract_options!
+        action = object.new_record? ? :create : :update
+        options.merge!(name: 'commit_and_continue_with_new' ,value: I18n.t("helpers.submit.#{action}_and_continue_with_new", resource_name: object.model_name.human))
+        submit(options)
+      end
+    end
+  end
+end

data/app/views/itsf/backend/resource/base/edit.html.haml

@@ -6,6 +6,8 @@
       = render partial: 'form_errors', locals: { resource: f.object }
       = render 'form', form: f
       = f.button :submit, class: 'btn btn-success'
+      = f.button :submit_and_continue_with_edit, class: 'btn btn-success'
+      = f.button :submit_and_continue_with_new, class: 'btn btn-success'
 
 .well.well-sm
   = link_to resource_path(@resource), class: 'btn btn-primary btn-responsive' do

data/app/views/itsf/backend/resource/base/new.html.haml

@@ -6,6 +6,8 @@
       = render partial: 'form_errors', locals: { resource: f.object }
       = render 'form', form: f
       = f.button :submit, class: 'btn btn-success'
+      = f.button :submit_and_continue_with_edit, class: 'btn btn-success'
+      = f.button :submit_and_continue_with_new, class: 'btn btn-success'
   %div.panel-footer
 
 .well.well-sm

data/config/initializers/simple_form_extensions.rb

@@ -1,4 +1,7 @@
 require 'simple_form/form_builder'
 
 require 'concerns/form/ui_autocomplete'
-SimpleForm::FormBuilder.send(:include, Concerns::Form::UiAutocomplete)
+SimpleForm::FormBuilder.send(:include, Concerns::Form::UiAutocomplete)
+
+require 'concerns/form/additional_submit_buttons'
+SimpleForm::FormBuilder.send(:include, Concerns::Form::AdditionalSubmitButtons)

data/config/locales/de.yml

@@ -37,7 +37,12 @@ de:
           notice: "%{resource_name} veröffentlicht."
         unpublished:
           notice: "%{resource_name} zurückgezogen."
-
+  helpers:
+    submit:
+      create_and_continue_with_edit: "%{resource_name} erstellen und weiter bearbeiten"
+      create_and_continue_with_new: "%{resource_name} erstellen und neu"
+      update_and_continue_with_edit: "%{resource_name} aktualisieren und weiter bearbeiten"
+      update_and_continue_with_new: "%{resource_name} aktualisieren und neu"
   itsf_backend: "Backend"
   itsf:
     backend:

data/lib/itsf/backend/version.rb

@@ -1,5 +1,5 @@
 module Itsf
   module Backend
-    VERSION = '1.1.6'
+    VERSION = '1.1.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itsf_backend
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -520,6 +520,7 @@ files:
 - app/extensions/concerns/resource_row/published_extensions.rb
 - app/extensions/concerns/resource_row/timestamp_extensions.rb
 - app/extensions/concerns/simple_form_form_builder_extensions.rb
+- app/forms/concerns/form/additional_submit_buttons.rb
 - app/forms/concerns/form/ui_autocomplete.rb
 - app/helpers/itsf/backend/application_helper.rb
 - app/inputs/fake_checkbox_input.rb