avo 2.13.0 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16af345f63f08dc026b6c1a29ce0938d7a0aad278a53884e542b8f31a17c34fa
-  data.tar.gz: ed4abef748fbe4e8e22edecd85ea70f361875e30f28ffdbddfb648fbf9cde226
+  metadata.gz: 6b921afbe3cb5f55ee67ac20bb21d65dffa91b2b3608dddf1c21b6f9fa5a686e
+  data.tar.gz: 5a7d24f4c324b1109717321b3200c41f6b61470fabc915fe41c662fb3858a108
 SHA512:
-  metadata.gz: 98d1460f53524d1747ac7db6a85c1c3e0e033d6ad42f624d699865500fa34079f30ea08d0a698ee756771269fb1b6d6e51d30a7663b008366a860dad6b1b6ed2
-  data.tar.gz: df8cd199ec20e5cf1f17a407ebcd6aa0d020254eedaf8b514a517d4c800d2a923bc4bd131aec1d1967b713be49f12d56167fc69efa4b638a17570967a568f312
+  metadata.gz: 0e740c3c1eb71a50fe32bf7856b993e8921c6891e16a09341d636fbcaa32faf8564fd417efc8c914573d959364d573851faaf1b943a5314f7aab78f8c752758f
+  data.tar.gz: 7d66c540afb965ac2a07e0a2d88fe811cd6c035cee7a0ce88e8cc926c53f2dd186cabf69fb69946becec707711edb49033cf2c4d6952cdfc13894302554fc1ac

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.13.0)
+    avo (2.13.1)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/app/controllers/avo/base_controller.rb

@@ -146,16 +146,14 @@ module Avo
         end
       end
 
-      respond_to do |format|
-        if saved
-          format.html { redirect_to after_create_path, notice: "#{@resource.name} #{t("avo.was_successfully_created")}." }
-        else
-          add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
-          add_breadcrumb t("avo.new").humanize
-          set_actions
-          flash.now[:error] = t "avo.you_missed_something_check_form"
-          format.html { render :new, status: :unprocessable_entity }
-        end
+      add_breadcrumb @resource.plural_name.humanize, resources_path(resource: @resource)
+      add_breadcrumb t("avo.new").humanize
+      set_actions
+
+      if saved
+        create_success_action
+      else
+        create_fail_action
       end
     end
 
@@ -167,27 +165,20 @@ module Avo
       # model gets instantiated and filled in the fill_model method
       saved = save_model
       @resource = @resource.hydrate(model: @model, view: :edit, user: _current_user)
+      set_actions
 
-      respond_to do |format|
-        if saved
-          format.html { redirect_to after_update_path, notice: "#{@resource.name} #{t("avo.was_successfully_updated")}." }
-        else
-          set_actions
-          flash.now[:error] = t "avo.you_missed_something_check_form"
-          format.html { render :edit, status: :unprocessable_entity }
-        end
+      if saved
+        update_success_action
+      else
+        update_fail_action
       end
     end
 
     def destroy
-      respond_to do |format|
-        if destroy_model
-          format.html { redirect_to params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), notice: t("avo.resource_destroyed", attachment_class: @attachment_class) }
-        else
-          error_message = @errors.present? ? @errors.first : t("avo.failed")
-
-          format.html { redirect_back fallback_location: params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), error: error_message }
-        end
+      if destroy_model
+        destroy_success_action
+      else
+        destroy_fail_action
       end
     end
 
@@ -398,6 +389,27 @@ module Avo
       add_breadcrumb t("avo.edit").humanize
     end
 
+    def create_success_action
+      respond_to do |format|
+        format.html { redirect_to after_create_path, notice: create_success_message}
+      end
+    end
+
+    def create_fail_action
+      respond_to do |format|
+        flash.now[:error] = create_fail_message
+        format.html { render :new, status: :unprocessable_entity }
+      end
+    end
+
+    def create_success_message
+      "#{@resource.name} #{t("avo.was_successfully_created")}."
+    end
+
+    def create_fail_message
+      t "avo.you_missed_something_check_form"
+    end
+
     def after_create_path
       # If this is an associated record return to the association show page
       if params[:via_relation_class].present? && params[:via_resource_id].present?
@@ -409,12 +421,57 @@ module Avo
       redirect_path_from_resource_option(:after_create_path) || resource_path(model: @model, resource: @resource)
     end
 
+    def update_success_action
+      respond_to do |format|
+        format.html { redirect_to after_update_path, notice: update_success_message }
+      end
+    end
+
+    def update_fail_action
+      respond_to do |format|
+        flash.now[:error] = update_fail_message
+        format.html { render :edit, status: :unprocessable_entity }
+      end
+    end
+
+    def update_success_message
+      "#{@resource.name} #{t("avo.was_successfully_updated")}."
+    end
+
+    def update_fail_message
+      t "avo.you_missed_something_check_form"
+    end
+
     def after_update_path
       return params[:referrer] if params[:referrer].present?
 
       redirect_path_from_resource_option(:after_update_path) || resource_path(model: @model, resource: @resource)
     end
 
+    def destroy_success_action
+      respond_to do |format|
+        format.html { redirect_to after_destroy_path, notice: destroy_success_message }
+      end
+    end
+
+    def destroy_fail_action
+      respond_to do |format|
+        format.html { redirect_back fallback_location: params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type]), error: destroy_fail_message }
+      end
+    end
+
+    def destroy_success_message
+      t("avo.resource_destroyed", attachment_class: @attachment_class)
+    end
+
+    def destroy_fail_message
+      @errors.present? ? @errors.first : t("avo.failed")
+    end
+
+    def after_destroy_path
+      params[:referrer] || resources_path(resource: @resource, turbo_frame: params[:turbo_frame], view_type: params[:view_type])
+    end
+
     def redirect_path_from_resource_option(action = :after_update_path)
       return nil if @resource.class.send(action).blank?
 

data/app/controllers/avo/search_controller.rb

@@ -47,7 +47,7 @@ module Avo
       query =  Avo::Hosts::SearchScopeHost.new(
         block: resource.search_query,
         params: params,
-        scope: resource.class.scope
+        scope: resource.class.scope.limit(8)
       ).handle
 
       query = apply_scope(query) if should_apply_any_scope?

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.13.0" unless const_defined?(:VERSION)
+  VERSION = "2.13.1" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-17 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails