Merge branch 'qa'

camsys · Jun 14, 2024 · 3725a2c · 3725a2c
2 parents fc030bc + 4c3b759
commit 3725a2c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/helpers/transam_tag_helper.rb b/app/helpers/transam_tag_helper.rb
@@ -115,7 +115,9 @@ def editable_field_tag(model_obj, field, label=nil, model_name: nil, required: t
 
     # Escape for HAML
     label = label.gsub('%','\%') if label
-    value = value.gsub('#', '\#') if value.is_a? String
+    # this is sort of a hack for now outright removing the '#{' to prevent escaping ruby code
+    value = value.gsub('#{', '') if value.is_a? String
+
     if url
       asset_path = url
     elsif model_name.nil? || model_obj.class.to_s == model_name
@@ -207,7 +209,8 @@ def editable_asset_field_tag(asset, field, label=nil, required: true, type: 'tex
 
     # Escape for HAML
     label = label.gsub('%','\%') if label
-    value = value.gsub('#', '\#') if value.is_a? String
+    # this is sort of a hack for now outright removing the '#{' to prevent escaping ruby code
+    value = value.gsub('#{', '') if value.is_a? String
     engine = Haml::Engine.new("
 ##{field}_group.form-group
   %label.control-label{class: '#{classes}'}

diff --git a/lib/transam_core/version.rb b/lib/transam_core/version.rb
@@ -1,3 +1,3 @@
 module TransamCore
-  VERSION = "2.42.0"
+  VERSION = "2.43.0"
 end