effective_resources 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 242ed65ef4c998474921ac8dfac92d10e378278f
-  data.tar.gz: 47a06cd06ed40ec273e0b39a6c891b7ee7ffdbea
+  metadata.gz: 3a87b01a9c51ff1343a94289520ae4eefa1a7945
+  data.tar.gz: 0ffe44c2a4fe358869fdc11a53c5c18af9ad1da3
 SHA512:
-  metadata.gz: 1976ae2d176a347561a8e46be0d0d807bc76d0b28051cbc366e1df787597e84d3c86fe4dab9bc9a50e4401a164cfe36189f4754919ae0a6c75da355ea7572907
-  data.tar.gz: d60fb69be39ab249983e1f0c0de0be33d08c8bdeecc7349492f702285b938500638b6de3a6362b62e28e31323ace75d57fad8b5c7636e0f0551b09c3640540de
+  metadata.gz: 4fec545b778f1f190adaa1825a4efc98505d7e53f86c4ca5480b2ac959b7f3000d058fb92cb131f00e7d91ef442774afb2074f0801e84a09649e77610e68f032
+  data.tar.gz: d8b42dd69ee0533a69f510c76506a527fab95c7aa8f49cf3a309c8fb1506f7aebb5fb6d273c98b8ff7f653d0bb68fadb0dd86f14e66c658cbf3cb855c1b89053

data/app/controllers/concerns/effective/crud_controller.rb

@@ -271,7 +271,6 @@ module Effective
 
         danger || save_action || 0
       end.inject({}) do |h, (commit, args)|
-        Rails.logger.info commit
         h[commit] = args.except(:action, :if, :unless, :redirect); h
       end
     end
@@ -313,9 +312,9 @@ module Effective
       case params[:commit].to_s
       when 'Save'
         [resource_edit_path, resource_show_path, resource_index_path].compact.first
-      when 'Save and Add New'
+      when 'Save and Add New', 'Add New'
         [resource_new_path, resource_index_path].compact.first
-      when 'Save and Continue'
+      when 'Continue', 'Save and Continue'
         resource_index_path
       else
         [referer_redirect_path, resource_index_path].compact.first

data/app/helpers/effective_resources_helper.rb

@@ -1,6 +1,6 @@
 module EffectiveResourcesHelper
 
-  def simple_form_submit(form, options = {class: 'form-actions'}, &block)
+  def simple_form_submit(form, options = {}, &block)
     resource = (@_effective_resource || Effective::Resource.new(controller_path))
 
     # Apply btn-primary to the first item, only if the class isn't already present
@@ -23,7 +23,9 @@ module EffectiveResourcesHelper
       end
     end
 
-    content_tag(:div, class: options[:class]) do
+    wrapper_options = { class: 'form-actions' }.merge(options.delete(:wrapper_html) || {})
+
+    content_tag(:div, wrapper_options) do
       buttons = actions.group_by { |(_, args)| args[:class] }.flat_map do |_, action|
         action.map { |action| form.button(:submit, *action) } + ['']
       end
@@ -41,9 +43,12 @@ module EffectiveResourcesHelper
     end
   end
 
-  def simple_form_save(form, label = 'Save', options = {class: 'form-actions'}, &block)
-    content_tag(:div, class: options[:class]) do
-      form.button(:submit, label, data: { disable_with: 'Saving...' }) + (capture(&block) if block_given?)
+  def simple_form_save(form, label = 'Save', options = {}, &block)
+    wrapper_options = { class: 'form-actions' }.merge(options.delete(:wrapper_html) || {})
+    options = { class: 'btn btn-primary', data: { disable_with: 'Saving...'} }.merge(options)
+
+    content_tag(:div, wrapper_options) do
+      form.button(:submit, label, options) + (capture(&block) if block_given?)
     end
   end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.6.4'.freeze
+  VERSION = '0.6.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails