effective_resources 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 998ed6153bddd85970840b07e11a165512fcce3e
-  data.tar.gz: 04d9581c21c2ff8499abf8bfc0995956b476eb96
+  metadata.gz: 7b28e265ce6c4288365663aa0bfc56adce448a02
+  data.tar.gz: 5ba116394c1a6a8d53c4f582a9a0118e99bfcbf8
 SHA512:
-  metadata.gz: 484de341ce813ef6fe402dd59b33ad0a5e5c8d8dfab95fcccb1230359a60ad1a888ba75de70951138e5172087dc49f3a531af0742dd8ba19338f47ad6915f871
-  data.tar.gz: 80059d4e5ce2b3fe4625ecfbfe6bda6cb6b4c5c924f37c2ba27861955cf6433f51d77dce5534814448cb940878a5b4af3994a3000340b6d133f6c515a45327d5
+  metadata.gz: 8bad6d3fb3a9d7c0c69babbeea1d9a53d25bd448772ad848b3361f2116a37044f3245634daa67e423c9eed4feb14e92e0c7815c0796c97363609c64acd3eb4cc
+  data.tar.gz: bafc5d5b585e8f1a9bfd02e7333313ad97f9cba5de1843e56aa59e76d58b850dca88f875dbb5ddf23435c2bc013394000bcdacec095f94b911ba21c376bf8f7f

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

@@ -101,8 +101,21 @@ module Effective
       resource_scope.where_values_hash.symbolize_keys
     end
 
-    def resource_datatable_class
-      effective_resource.datatable_klass
+    def resource_datatable(action)
+      datatable_klass = if action == :index
+        effective_resource.datatable_klass
+      else # Admin::ActionDatatable.new
+        "#{[effective_resource.namespace.to_s.classify.presence, action.to_s.classify].compact.join('::')}Datatable".safe_constantize ||
+        "#{[effective_resource.namespace.to_s.classify.presence, action.to_s.pluralize.classify].compact.join('::')}Datatable".safe_constantize ||
+        "#{[effective_resource.namespace.to_s.classify.presence, action.to_s.singularize.classify].compact.join('::')}Datatable".safe_constantize
+      end
+
+      return unless datatable_klass.present?
+
+      datatable = datatable_klass.new(resource_datatable_attributes)
+      datatable.view = view_context
+
+      datatable
     end
 
     def resource_params_method_name

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

@@ -9,11 +9,7 @@ module Effective
         @page_title ||= resource_plural_name.titleize
 
         self.resources ||= resource_scope.all
-
-        if (datatable = resource_datatable_class).present?
-          @datatable ||= datatable.new(resource_datatable_attributes)
-          @datatable.view = view_context
-        end
+        @datatable = resource_datatable(:index)
 
         run_callbacks(:resource_render)
       end
@@ -195,7 +191,12 @@ module Effective
         @page_title ||= "#{action.to_s.titleize} #{resource_plural_name.titleize}"
 
         if request.get?
-          run_callbacks(:resource_render); return
+          @datatable = resource_datatable(action)
+          run_callbacks(:resource_render)
+
+          view = lookup_context.template_exists?(action, _prefixes) ? action : :index
+          render(view, locals: { action: action })
+          return
         end
 
         raise "expected all #{resource_name} objects to respond to #{action}!" if resources.to_a.present? && !resources.all? { |resource| resource.respond_to?("#{action}!") }

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

@@ -15,13 +15,13 @@ module Effective
         elsif lookup_context.template_exists?(action, _prefixes)
           format.html do
             flash.now[:success] ||= resource_flash(:success, resource, action)
-            # action.html.haml
+            render(action) # action.html.haml
           end
 
           format.js do
             flash.now[:success] ||= resource_flash(:success, resource, action)
-            reload_resource
-            # action.js.erb
+            reload_resource unless action == :destroy
+            render(action) # action.js.erb
           end
         else # Default
           format.html do
@@ -42,18 +42,16 @@ module Effective
 
         run_callbacks(:resource_render)
 
-        case params[:action]
-        when 'create'
+        # HTML responder
+        case action.to_sym
+        when :create
           format.html { render :new }
-        when 'update'
+        when :update
           format.html { render :edit }
-        when 'destroy'
-          # We always need to redirect here
+        when :destroy
           flash[:danger] = flash.now.delete(:danger)
-
           format.html { redirect_to(resource_redirect_path(action)) }
-          format.js { redirect_to(resource_redirect_path(action)) }
-        else # member_action
+        else # member action
           format.html do
             if lookup_context.template_exists?(action, _prefixes)
               @page_title ||= "#{action.to_s.titleize} #{resource}"
@@ -75,24 +73,16 @@ module Effective
           end
         end
 
-        format.js do
-          view = lookup_context.template_exists?(action, _prefixes) ? action : :member_action
-          render(view, locals: { action: action })
-        end
-      end
-
-      # For destroy.js
-      def respond_with_error_and_redirect(format, resource, action)
-        flash.delete(:success)
-        flash[:danger] ||= resource_flash(:danger, resource, action)
-
-        format.html do
-          redirect_to(resource_redirect_path(action))
+        # Javascript responder
+        if action.to_sym == :destroy
+          format.js { redirect_to(resource_redirect_path(action)) }
+        else
+          format.js do
+            view = lookup_context.template_exists?(action, _prefixes) ? action : :member_action
+            render(view, locals: { action: action }) #
+          end
         end
 
-        format.js do
-          redirect_to(resource_redirect_path(action))
-        end
       end
 
     end

data/app/helpers/effective_resources_helper.rb

@@ -3,6 +3,7 @@ module EffectiveResourcesHelper
   # effective_bootstrap
   def effective_submit(form, options = {}, &block)
     actions = (controller.respond_to?(:effective_resource) ? controller.class : find_effective_resource).submits
+    actions = actions.select { |k, v| v[:default] != true } if options.delete(:defaults) == false
     actions = permitted_resource_actions(form.object, actions)
 
     submits = actions.map { |name, opts| form.save(name, opts.except(:action, :title, 'data-method', 'data-confirm')) }.join.html_safe

data/app/views/application/index.html.haml

@@ -4,7 +4,7 @@
   .col-8
     %h1= @page_title
   .col-4.text-right
-    = render_resource_actions(resource.klass, index: false)
+    = render_resource_buttons(resource.klass, (action ||= :index) => false)
 
 - if @datatable
   = render_datatable(@datatable)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.0.13'.freeze
+  VERSION = '1.0.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails