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

CCAFS · Jan 16, 2024 · d9dcd87 · d9dcd87
2 parents f2131e2 + ebc002f
commit d9dcd87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/marlo-data/src/main/resources/xmls/TipParameters.hbm.xml b/marlo-data/src/main/resources/xmls/TipParameters.hbm.xml
@@ -6,7 +6,7 @@
     optimistic-lock="none">
       <id name="id" type="java.lang.Long">
       <column name="id" />
-     <generator class="assigned" />
+     <generator class="identity" />
     </id>
     <property name="tipTokenService" type="string">
       <column name="tip_token_service"/>

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectLeverages.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectLeverages.ftl
@@ -134,9 +134,9 @@
       [#-- Type select --]
       <div class="col-md-8">
         [#if (leverage.isPhaseOneLeverage())!false ]
-          [@customForm.select name="${leverageCustomName}.ipProgram.id" label=""  i18nkey="Flagship" listName="flagshipsPhaseOne" keyFieldName="id"  displayFieldName="composedName"  multiple=false required=true  className="flagshipSelect form-control input-sm " editable=isEditable/]
+          [@customForm.select name="${leverageCustomName}.ipProgram.id" label=""  i18nkey="global.flagship" listName="flagshipsPhaseOne" keyFieldName="id"  displayFieldName="composedName"  multiple=false required=true  className="flagshipSelect form-control input-sm " editable=isEditable/]
         [#else]
-          [@customForm.select name="${leverageCustomName}.crpProgram.id" label=""  i18nkey="Flagship" listName="flagshipsPhaseTwo" keyFieldName="id"  displayFieldName="composedName"   multiple=false required=true  className="flagshipSelect form-control input-sm " editable=isEditable/]
+          [@customForm.select name="${leverageCustomName}.crpProgram.id" label=""  i18nkey="global.flagship" listName="flagshipsPhaseTwo" keyFieldName="id"  displayFieldName="composedName"   multiple=false required=true  className="flagshipSelect form-control input-sm " editable=isEditable/]
         [/#if]
       </div> 
       [#-- Budget select --]