rao-resources_controller 0.0.49.pre → 0.0.51.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49403d74f7f8f424205b8f94e50b24c5eeded006ddad1656d35b5bdb4a0edfc8
-  data.tar.gz: 860e42fee2505e0f0b62063a78003e90e6522af30aa59bae78396677ff6863d4
+  metadata.gz: ed77f13d64e453c1739f049490a162ecb6ae2692e773488fe2800e1d9706671a
+  data.tar.gz: 5e56b6a6b51aca5497681d3b30581fc0fe8d8db312ffa6923b44845c9b833587
 SHA512:
-  metadata.gz: 67449b0e3579bb1b00fd22a4c53f8655c1f05f1fb91e20dff37bd2320f67decbfa549aa1ce8346d21b0445433ae52fea577a0ba8c10e093c5aa34ccb58dd464e
-  data.tar.gz: '059aace6a67a1d8f82e8db32055223c7f088f3d83f28e8bcd42328b1c3db0ee9220caf988da6aeea30fd067988d6a688cc69564de3a797be44d765782552c477'
+  metadata.gz: 8ba4b9b0276212d1c74f18f69e1cd412d68f9f93afabf9e6656745c21785277c084da11b37c582ca561f4792c1b1667544698a7fd71d3536b08f4fc4fb7f7115
+  data.tar.gz: 8da548cadd086c29e6db291cc69f229d9d5fda29dba384c61d7a426e5310a359cef3c91df58d28bbfb3b62b5b303da0bcda7ed9ba9a0f09f4c5ce0c1d6d0693b

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/location_history_concern.rb

@@ -16,7 +16,7 @@ module Rao
 
     def store_location
       return if request.referer.nil?
-      truncate_location_history(9)
+      truncate_location_history(3)
       logger.debug "[LocationHistoryConcern] Storing last location [#{request.referer}]"
       location_history[Time.zone.now] = request.referer
     end

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.49.pre
+  version: 0.0.51.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-10-28 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.4.11
+rubygems_version: 3.4.21
 signing_key: 
 specification_version: 4
 summary: Resources Controllers for Ruby on Rails.