Merge branch 'aiccra-tip-migrations' into aiccra-dev

CCAFS · Mar 7, 2024 · d0fa573 · d0fa573
2 parents c389170 + ed90ff8
commit d0fa573
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/marlo-web/src/main/resources/struts-json.xml b/marlo-web/src/main/resources/struts-json.xml
@@ -1206,6 +1206,15 @@
         <param name="excludeNullProperties">true</param>
       </result>
     </action>
+
+
+	<action name="tipTokenService"		
+		class="org.cgiar.ccafs.marlo.action.json.superadmin.TipGetTokenServiceAction">
+		<result type="json">
+		    <param name="noCache">true</param>
+	        <param name="excludeNullProperties">true</param>
+		</result>
+	</action>
 
 	</package>
 
@@ -1243,14 +1252,6 @@
 				<param name="excludeNullProperties">true</param>
 			</result>
 		</action>
-
-		<action name="tipTokenService"		
-	      class="org.cgiar.ccafs.marlo.action.json.superadmin.TipGetTokenServiceAction">
-	      <result type="json">
-	        <param name="noCache">true</param>
-	        <param name="excludeNullProperties">true</param>
-	      </result>
-	    </action>
 
 		<action name="validateCenterImpactPathway"
 			class="org.cgiar.ccafs.marlo.action.center.json.impactpathway.ValidateImpactPathwaySectionAction">

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/tip/tipEmbedded.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/tip/tipEmbedded.ftl
@@ -1,9 +1,9 @@
 [#ftl]
 [#assign title = "TIP" /]
 [#assign currentSectionString = "${actionName?replace('/','-')}-phase-${(actualPhase.id)!}" /]
-[#assign customJS = ["${baseUrlMedia}/js/tip/tipEmbedded.js?20240306"] /]
+[#assign customJS = ["${baseUrlMedia}/js/tip/tipEmbedded.js?20240307"] /]
 [#assign customCSS = [
-  "${baseUrl}/crp/css/tip/tipEmbedded.css?20240306",  "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css"
+  "${baseUrl}/crp/css/tip/tipEmbedded.css?20240307",  "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css"
   ] 
 /]
 [#assign currentSection = "tip" /]