rao-resources_controller 0.0.48.pre → 0.0.50.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ce8af3cd312aa3406286e3d4a28344a89d612ba4e567dc6189f0b0cc15f57e
-  data.tar.gz: dbb59f4181f6b243dad00c5b26265ad88de50f8b97397ac111fcf467c3f39b23
+  metadata.gz: 9a77482ef8736751ebab6c1ea43335f9c83b0df9b12e765956adb94ae366befe
+  data.tar.gz: 475e4173a5e082f3547532b233083b402741c46f1c14fd62ccbd7daeb700d1ef
 SHA512:
-  metadata.gz: 6d6d31f19420c6a04f0ac4f8f22171552701d050396085409c69836e3386ab9b64cd78e8dd217cc2c235e6d045b740d42d078cac60f1acb761f04492ce4ca5a8
-  data.tar.gz: ac5fa0ff35c92566a97275e55e6133f5c6ca3263fd4f7e1bc9f4611f0e8912ebddd1fc9b04780fa7d79277d305cddc11b500cf99aa9e49dc69cf18620362aa62
+  metadata.gz: 8e8f943e0eb527ae4e4c27299334a094d66dd1dd4917c1d460862a0ddd058f0fc0c6481f9cb5160f72f501c73f56536ac4a597cbbbccb3babed15f61662a508f
+  data.tar.gz: 1de3255653c1cc23f8c804e8b6d1c83f3393d039970dfaa2b2c01204fdb29e1ce90f92a0b4dd5fc7ed1e3c9b51bebd2dfe203b338ffddb377019afc9f3c83e5e

data/app/concerns/rao/resources_controller/aasm_concern.rb

@@ -8,11 +8,26 @@ module Rao
       end
 
       def trigger_event
-        if @resource.aasm(permitted_params_for_trigger_event[:machine_name].to_sym).fire!(permitted_params_for_trigger_event[:event_name].to_sym)
-          flash[:notice] = t('rao.resources_controller.aasm_concern.trigger_event.success', state: @resource.aasm(permitted_params_for_trigger_event[:machine_name].to_sym).current_state, event: permitted_params_for_trigger_event[:event_name])
+        begin
+          result = @resource.aasm(permitted_params_for_trigger_event[:machine_name].to_sym).fire!(permitted_params_for_trigger_event[:event_name].to_sym)
+        rescue ActiveRecord::RecordInvalid => e
+          result = false
+        end
+
+        if result
+          flash[:notice] = t(
+            'rao.resources_controller.aasm_concern.trigger_event.success',
+            event: permitted_params_for_trigger_event[:event_name],
+            state: @resource.aasm(permitted_params_for_trigger_event[:machine_name].to_sym).current_state
+          )
         else
-          flash[:notice] = t('rao.resources_controller.aasm_concern.trigger_event.failure', state: @resource.aasm(permitted_params_for_trigger_event[:machine_name].to_sym).current_state, event: permitted_params_for_trigger_event[:event_name])
+          flash[:danger] = t(
+            'rao.resources_controller.aasm_concern.trigger_event.failure',
+            event: permitted_params_for_trigger_event[:event_name],
+            errors: @resource.errors.full_messages.to_sentence
+          )
         end
+
         redirect_back(fallback_location: root_path)
       end
 

data/app/concerns/rao/resources_controller/awesome_nested_set_concern.rb

@@ -4,7 +4,7 @@ module Rao
 
     def reposition
       @resource = load_resource
-      @dropped_resource = resource_class.find(params[:dropped_id])
+      @dropped_resource = load_resource_scope.find(params[:dropped_id])
       @dropped_resource.move_to_right_of(@resource)
 
       label_methods = [:human, :name, :email, :to_s]
@@ -25,7 +25,13 @@ module Rao
         end
       end
 
-      redirect_to collection_path, notice: I18n.t("awesome_nested_set.flash.actions.reposition.notice", target_resource: target_resource_label, inserted_resource: inserted_resource_label)
+      redirect_to after_reposition_location, notice: I18n.t("awesome_nested_set.flash.actions.reposition.notice", target_resource: target_resource_label, inserted_resource: inserted_resource_label)
+    end
+
+    private
+
+    def after_reposition_location
+      collection_path
     end
   end
 end

data/app/concerns/rao/resources_controller/batch_actions_concern.rb

@@ -12,10 +12,10 @@ module Rao
       count = @collection.count
       @collection.destroy_all
 
-      default_message = t('.success', inflections.merge(count: count))
+      default_message = t('.success', **inflections.merge(count: count, raise: false))
       respond_with @collection,
         location: after_destroy_many_location,
-        notice: t('rao.resources_controller.batch_actions_concern.destroy_many.success', inflections.merge(count: count, default: default_message))
+        notice: t('rao.resources_controller.batch_actions_concern.destroy_many.success', **inflections.merge(count: count, default: default_message))
     end
 
     private

data/app/concerns/rao/resources_controller/kaminari_concern.rb

@@ -4,13 +4,18 @@ module Rao
 
     included do
       helper_method :paginate?
+      helper_method :per_page
     end
+    
+    private
 
     def paginate?
       true
     end
 
-    private
+    def per_page_default
+      Rao::ResourcesController::Configuration.pagination_per_page_default
+    end
 
     def load_collection
       @collection = load_collection_scope.page(params[:page]).per(per_page)
@@ -19,7 +24,7 @@ module Rao
     def per_page
       # Return page size from configuration if per_page is not present in params
       unless params.has_key?(:per_page)
-        return Rao::ResourcesController::Configuration.pagination_per_page_default
+        return per_page_default
       end
 
       # Return count of all records or nil if no records present if

data/app/views/rao/resources_controller/base/edit.html.haml

@@ -1,4 +1,4 @@
-%h1= t('.title', inflections)
+%h1= t('.title', **inflections)
 
 = simple_form_for(@resource, url: resource_path(@resource)) do |f|
   = render 'form_errors',  resource: f.object

data/app/views/rao/resources_controller/base/new.html.haml

@@ -1,4 +1,4 @@
-%h1= t('.title', inflections)
+%h1= t('.title', **inflections)
 
 = simple_form_for(@resource, url: collection_path) do |f|
   = render 'form_errors',  resource: f.object

data/config/locales/de.yml

@@ -34,6 +34,7 @@ de:
     resources_controller:
       aasm_concern:
         trigger_event:
+          failure: "Der Vorgang %{event} war nicht erfolgreich. Es traten folgende Fehler auf: %{errors}"
           success: "Der Vorgang %{event} war erfolgreich. Der neue Status ist %{state}."
       base:
         form_buttons:

data/config/locales/en.yml

@@ -34,6 +34,7 @@ en:
     resources_controller:
       aasm_concern:
         trigger_event:
+          failure: "The event %{event} failed. Errors: %{errors}"
           success: "The event %{event} completed successfully. The new state is %{state}."
       base:
         form_buttons:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rao-resources_controller
 version: !ruby/object:Gem::Version
-  version: 0.0.48.pre
+  version: 0.0.50.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.24
+rubygems_version: 3.4.20
 signing_key: 
 specification_version: 4
 summary: Resources Controllers for Ruby on Rails.