From 33487cc1664d831300138112a942ca0471b0010d Mon Sep 17 00:00:00 2001
From: codebymikey <9484406+codebymikey@users.noreply.github.com>
Date: Wed, 21 May 2025 16:21:05 +0100
Subject: [PATCH] Fix issue with the comment image elements losing their name
 attributes

---
 app/views/wkexpense/edit.html.erb | 3 ---
 app/views/wktime/edit.html.erb    | 2 --
 assets/javascripts/edit.js        | 6 ++++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/views/wkexpense/edit.html.erb b/app/views/wkexpense/edit.html.erb
index 1ba997c8..7a6726ff 100644
--- a/app/views/wkexpense/edit.html.erb
+++ b/app/views/wkexpense/edit.html.erb
@@ -19,9 +19,6 @@
 			Setting.plugin_redmine_wktime['wktime_enter_comment_in_row'].to_i == 1 %>
 				commentInRow = true;
 		<% end %>
-		withCommantImg = '<%= image_tag('withcommant.png', plugin: 'redmine_wktime') %>';
-		withoutcommantImg = '<%= image_tag('withoutcommant.png', plugin: 'redmine_wktime') %>';
-
 	</script>
 
 	<div id="comment-dlg">
diff --git a/app/views/wktime/edit.html.erb b/app/views/wktime/edit.html.erb
index dfc8c2c5..745b03cf 100644
--- a/app/views/wktime/edit.html.erb
+++ b/app/views/wktime/edit.html.erb
@@ -43,8 +43,6 @@
 			Setting.plugin_redmine_wktime['wktime_enter_comment_in_row'].to_i == 1 %>
 				commentInRow = true;
 		<% end %>
-		withCommantImg = '<%= image_tag('withcommant.png', plugin: 'redmine_wktime') %>';
-		withoutcommantImg = '<%= image_tag('withoutcommant.png', plugin: 'redmine_wktime') %>';
 	</script>
 
 	<div id="comment-dlg">
diff --git a/assets/javascripts/edit.js b/assets/javascripts/edit.js
index 3f327faa..dc20cf22 100644
--- a/assets/javascripts/edit.js
+++ b/assets/javascripts/edit.js
@@ -31,6 +31,8 @@ var minHourperWeekAlertMsg="";
 var maxHourperWeekAlertMsg="";
 var attachmentDiv = "";
 var attachmentField = "";
+var withCommantSrc = RAILS_ASSET_URL('/plugin_assets/redmine_wktime/withcommant.png');
+var withoutCommantSrc = RAILS_ASSET_URL('/plugin_assets/redmine_wktime/withoutcommant.png');
 
 $(document).ready(function() {
 	var e_comments = $( "#_edit_comments_" );
@@ -102,11 +104,11 @@ $(document).ready(function() {
 					var x = document.getElementsByName("custfield_img"+comment_row+"[]");
 					if( ((e_comments.val() != "" || custFldToolTip)  && (!commentInRow  || custFldToolTip )) || $("#attachment_" + comment_row + "_" + comment_col + " .attachments_fields").children().length > 0)
 					{
-						$(x[comment_col-1]).replaceWith(withCommantImg);
+						$(x[comment_col-1]).attr({src: withCommantSrc});
 					}
 					else
 					{
-						$(x[comment_col-1]).replaceWith(withoutcommantImg);
+						$(x[comment_col-1]).attr({src: withoutCommantSrc});
 					}
 					$(attachmentField).appendTo(attachmentDiv);
 					$( this ).dialog( "close" );