Merge branch 'A2-1101-Bug-after-delete-comment-feedback' into aiccra-…

…staging
CCAFS · Feb 17, 2025 · 186f8b7 · 186f8b7
2 parents c77bc76 + 3ecb491
commit 186f8b7
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/marlo-web/src/main/resources/custom/aicrra.properties b/marlo-web/src/main/resources/custom/aicrra.properties
@@ -2225,7 +2225,7 @@ marloRequestCreation.webSiteLink.placeholder=https://example.com
 
 # Footer
 footer.contactEmail=MARLOSupport@cgiar.org
-footer.copyrighAlert=Copyright &#169; 2013-2024 Alliance of Bioversity International and CIAT.
+footer.copyrighAlert=Copyright &#169; 2013-{0} Alliance of Bioversity International and CIAT.
 footer.developedBy=Developed by the Innovation and Business Development (IBD) team of the Technology Integration Unit.
 footer.rightsReserved=Some rights reserved
 footer.report.issue=Please report any system problems and send us your feedback {0}

diff --git a/marlo-web/src/main/resources/global.properties b/marlo-web/src/main/resources/global.properties
@@ -2310,7 +2310,7 @@ marloRequestCreation.webSiteLink.placeholder=https://example.com
 
 # Footer
 footer.contactEmail=MARLOSupport@cgiar.org
-footer.copyrighAlert=Copyright &#169; 2013-2024 Alliance of Bioversity International and CIAT.
+footer.copyrighAlert=Copyright &#169; 2013-{0} Alliance of Bioversity International and CIAT.
 footer.developedBy=Developed by the Innovation and Business Development (IBD) team of the Technology Integration Unit.
 footer.rightsReserved=Some rights reserved
 footer.report.issue=Please report any system problems and send us your feedback {0}

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectContributionCrp.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectContributionCrp.ftl
@@ -5,7 +5,7 @@
 [#assign customJS = [ 
   "${baseUrlMedia}/js/projects/projectContributionCrp.js?20230310", 
   "${baseUrlCdn}/global/js/fieldsValidation.js?20221031",
-  "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20240313",
+  "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20250205",
   "https://www.gstatic.com/charts/loader.js",
   "https://cdn.datatables.net/buttons/1.3.1/js/dataTables.buttons.min.js",
   "//cdn.datatables.net/buttons/1.3.1/js/buttons.html5.min.js",

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectDeliverable.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectDeliverable.ftl
@@ -7,7 +7,7 @@
   "${baseUrlMedia}/js/projects/deliverables/deliverableShfrm.js?20240711",
   "${baseUrlMedia}/js/projects/deliverables/deliverableDissemination.js?20240729",
   "${baseUrlMedia}/js/projects/deliverables/deliverableQualityCheck.js?20220721",
-  "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20240313",
+  "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20250205",
   [#--  "${baseUrlMedia}/js/projects/deliverables/deliverableDataSharing.js?20180523",--]
   [#--  "${baseUrlCdn}/global/js/autoSave.js",--]
   "${baseUrlCdn}/global/js/fieldsValidation.js?20180529"

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectInnovation.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectInnovation.ftl
@@ -6,7 +6,7 @@
 [#assign customJS = [
   "${baseUrlMedia}/js/projects/projectInnovations.js?20241210",
   "${baseUrlCdn}/global/js/fieldsValidation.js",
-  "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20241210"
+  "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20250205"
 ] /]
 [#assign customCSS = ["${baseUrlMedia}/css/projects/projectInnovations.css?20250121"] /]
 [#assign currentSection = "projects" /]

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectStudy.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectStudy.ftl
@@ -5,7 +5,7 @@
 [#assign customJS = [
   "${baseUrlMedia}/js/projects/projectStudy.js?20250203",
   "${baseUrlCdn}/global/js/fieldsValidation.js",
-  "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20240313"
+  "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20250205"
   ] 
 /]
 [#assign customCSS = [

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/safeguard.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/safeguard.ftl
@@ -7,7 +7,7 @@
   [#-- "${baseUrlCdn}/global/js/autoSave.js", --]
   "${baseUrlCdn}/global/js/impactGraphic.js",
   "${baseUrlCdn}/global/js/fieldsValidation.js",
-  "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20240313"
+  "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20250205"
   ]
 /]
 [#assign customCSS = [

diff --git a/marlo-web/src/main/webapp/WEB-INF/global/pages/footer-info.ftl b/marlo-web/src/main/webapp/WEB-INF/global/pages/footer-info.ftl
@@ -87,7 +87,7 @@
 [#-- Copyright --]
 <div class="copyRight">
   <hr />
-  <span>[@s.text name="footer.copyrighAlert" /]</span><br />
+  <span>[@s.text name="footer.copyrighAlert"][@s.param]${.now?string("yyyy")}[/@s.param][/@s.text]</span><br />
   <span style="opacity:0.7;">[@s.text name="footer.developedBy" /]<span><br> 
   <span style="opacity:0.5;">[@s.text name="footer.rightsReserved" /]</span>
 </div>

diff --git a/marlo-web/src/main/webapp/crp/js/feedback/feedbackAutoImplementation.js b/marlo-web/src/main/webapp/crp/js/feedback/feedbackAutoImplementation.js
@@ -651,6 +651,9 @@ function hideShowOptionButtons(block, status) {
 			block.find('img.clarificationCommentBtn').hide();
 			block.find('div.deleteCommentBtn').show();
 			block.find('.containerSentCommentBtn').hide();
+			block.find('.correctCommentBtn').show();
+			block.find('.editCommentBtn').show();
+			block.find('.dismissCommentBtn').show();
 			block.find('.commentTitle').css('font-style', 'oblique');
 			block.find('.commentTitle').css('font-weight', '200');
 			block.find('.commentReadonly').css('font-style', 'oblique');