fix: collect errors from record without exception (#2610)

* fix: collect errors from record without exception * .
avo-hq · Mar 25, 2024 · 8dc5609 · 8dc5609
1 parent 5733e8e
commit 8dc5609
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/controllers/avo/base_controller.rb b/app/controllers/avo/base_controller.rb
@@ -245,9 +245,14 @@ def perform_action_and_record_errors(&block)
       end
 
       # Add the errors from the record
-      @errors = @record.errors.full_messages.reject { |error| exception_message.include? error }.unshift exception_message
+      @errors = @record.errors.full_messages
 
-      succeeded
+      # Remove duplicated errors
+      if exception_message.present?
+        @errors = @errors.reject { |error| exception_message.include? error }.unshift exception_message
+      end
+
+      @errors.any? ? false : succeeded
     end
 
     def model_params

diff --git a/spec/system/model_errors_spec.rb b/spec/system/model_errors_spec.rb
@@ -6,8 +6,6 @@
   around do |example|
     Comment.before_destroy do
       errors.add(:base, "Some Errors")
-
-      throw(:abort)
     end
 
     example.run