use default activity && bump

ELVIS-SOFTWARE · Mar 29, 2024 · be50063 · be50063
1 parent 2047576
commit be50063
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/controllers/activities_applications_controller.rb b/app/controllers/activities_applications_controller.rb
@@ -294,6 +294,15 @@ def new
                               .transform_values { |values| values.max_by { |ar| ar["display_price"] } }
                               .values
 
+    # If default activityRef is set, we replace the activityRef (id) with the default one
+    display_activity_refs.each do |ar|
+      default = ActivityRefKind.find_by(id: ar["activity_ref_kind_id"])&.default_activity_ref
+
+      if default
+        ar["id"] = default.id
+      end
+    end
+
     @activity_refs = display_activity_refs
                        .flatten
                        .sort_by { |a| a["kind"] }

diff --git a/lib/elvis/version.rb b/lib/elvis/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Elvis
-  VERSION = "2.2.9"
+  VERSION = "2.2.10"
 end