🔧 chore(innovations): Update innovation list properties for organizat…

…ion types
CCAFS · Feb 7, 2025 · a7587e3 · a7587e3
1 parent 7ad364d
commit a7587e3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/...b/src/main/java/org/cgiar/ccafs/marlo/validation/projects/ProjectInnovationValidator.java b/...b/src/main/java/org/cgiar/ccafs/marlo/validation/projects/ProjectInnovationValidator.java
@@ -24,7 +24,6 @@
 import org.cgiar.ccafs.marlo.data.model.Project;
 import org.cgiar.ccafs.marlo.data.model.ProjectInnovation;
 import org.cgiar.ccafs.marlo.data.model.ProjectInnovationActor;
-import org.cgiar.ccafs.marlo.data.model.ProjectInnovationAllianceOrganization;
 import org.cgiar.ccafs.marlo.data.model.ProjectInnovationCenter;
 import org.cgiar.ccafs.marlo.data.model.ProjectInnovationGeographicScope;
 import org.cgiar.ccafs.marlo.data.model.ProjectInnovationInfo;
@@ -637,20 +636,22 @@ public void validateGeneralInformation(BaseAction action, Project project, Proje
       try {
         if (projectInnovation.getAllianceOrganizations() != null
           && !projectInnovation.getAllianceOrganizations().isEmpty()) {
-          int count = 0;
-          for (ProjectInnovationAllianceOrganization allianceOrganizations : projectInnovation
-            .getAllianceOrganizations()) {
-            if (allianceOrganizations.getInstitutionType() == null
-              || allianceOrganizations.getInstitutionType().getId() == null
-              || allianceOrganizations.getInstitutionType().getId() == -1) {
-              action.addMessage(action.getText("innovation.allianceOrganizations[" + count + "].institutionType.id"));
-              action.addMissingField("innovation.allianceOrganizations[" + count + "].institutionType.id");
-              action.getInvalidFields().put("list-innovation.allianceOrganizations[" + count + "].institutionType.id",
-                action.getText(InvalidFieldsMessages.EMPTYLIST, new String[] {"actors"}));
-            }
-            count++;
-
-          }
+          // Removed 07/02/2025
+          /*
+           * int count = 0;
+           * for (ProjectInnovationAllianceOrganization allianceOrganizations : projectInnovation
+           * .getAllianceOrganizations()) {
+           * if (allianceOrganizations.getInstitutionType() == null
+           * || allianceOrganizations.getInstitutionType().getId() == null
+           * || allianceOrganizations.getInstitutionType().getId() == -1) {
+           * action.addMessage(action.getText("innovation.allianceOrganizations[" + count + "].institutionType.id"));
+           * action.addMissingField("innovation.allianceOrganizations[" + count + "].institutionType.id");
+           * action.getInvalidFields().put("list-innovation.allianceOrganizations[" + count + "].institutionType.id",
+           * action.getText(InvalidFieldsMessages.EMPTYLIST, new String[] {"actors"}));
+           * }
+           * count++;
+           * }
+           */
         }
       } catch (Exception e) {
         Log.error("error validating actors " + e);

diff --git a/marlo-web/src/main/webapp/WEB-INF/global/macros/innovationTemplates.ftl b/marlo-web/src/main/webapp/WEB-INF/global/macros/innovationTemplates.ftl
@@ -798,14 +798,15 @@
   <div id="organizationsInnovation-${(template?string('template', ''))}" class="organizationsInnovation form-group grayBlueBox ${class}">
     [#-- Hidden not saved - id --]
     [@customForm.input name="${customName}.id" className="indexTag" value=((element.id)?string)!"" editable=false display=false /]
-    [#-- "Dropdown Organizations - Type --]
+    [#-- "Dropdown Organizations - Type 
     <div class="col-md-12">
       [@customForm.select name="${customName}.institutionType.id" showTitle=false  i18nkey="projectInnovations.organizations" listName="institutionTypeList" keyFieldName="id" displayFieldName="name" required=false editable=true /]
     </div>
+    --]
     [#-- Input Organization name --]
     <div class="col-md-12">
       <label>[@s.text name="projectInnovations.anticipatedUsers.organizations.name" /]:</label>
-      [@customForm.select name="${customName}.institution.id" showTitle=false  i18nkey="projectInnovations.anticipatedUsers.organizations" listName="institutions" keyFieldName="id" displayFieldName="name" required=false editable=true /]
+      [@customForm.select name="${customName}.institution.id" showTitle=false  i18nkey="projectInnovations.anticipatedUsers.organizations" listName="institutions" keyFieldName="id" displayFieldName="composedName" required=false editable=true /]
     </div>
     [#-- Checkbox - is a co-development --]
     <div class="col-md-12">