Merge branch 'aiccra-staging' into aiccra-dev

CCAFS · Dec 19, 2023 · 393ac72 · 393ac72
2 parents 17bf953 + 107e552
commit 393ac72
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/marlo-parent/pom.xml b/marlo-parent/pom.xml
@@ -20,7 +20,7 @@
 		<javax.inject.version>1</javax.inject.version>
 		<javax-mail.version>1.5.5</javax-mail.version>
 		<com.sun.mail.version>1.5.5</com.sun.mail.version>
-		<struts2.version>2.5.30</struts2.version>
+		<struts2.version>2.5.33</struts2.version>
 		<mysql.version>8.0.16</mysql.version>
 		<servlet-api.version>3.0.1</servlet-api.version>
 		<jsp-api.version>2.2.1</jsp-api.version>

diff --git a/...src/main/java/org/cgiar/ccafs/marlo/action/json/project/ValidateProjectSectionAction.java b/...src/main/java/org/cgiar/ccafs/marlo/action/json/project/ValidateProjectSectionAction.java
@@ -648,7 +648,7 @@ public void prepare() throws Exception {
     Map<String, Parameter> parameters = this.getParameters();
 
     loggedCrp = (GlobalUnit) this.getSession().get(APConstants.SESSION_CRP);
-    if (loggedCrp.getId() != null && crpManager.getGlobalUnitById(loggedCrp.getId()) != null) {
+    if (loggedCrp != null && loggedCrp.getId() != null && crpManager.getGlobalUnitById(loggedCrp.getId()) != null) {
       loggedCrp = crpManager.getGlobalUnitById(loggedCrp.getId());
     }
 

diff --git a/marlo-web/src/main/java/org/cgiar/ccafs/marlo/validation/projects/DeliverableValidator.java b/marlo-web/src/main/java/org/cgiar/ccafs/marlo/validation/projects/DeliverableValidator.java
@@ -489,7 +489,7 @@ public void validate(BaseAction action, Deliverable deliverable, boolean saving)
       }
 
       if (action.hasSpecificities(APConstants.DUPLICATED_DELIVERABLES_FUNCTIONALITY_ACTIVE)) {
-        if (dInfo != null && dInfo.getDuplicated()) {
+        if (dInfo != null && dInfo.getDuplicated() != null && dInfo.getDuplicated()) {
           action.addMessage(action.getText("deliverable.status.duplicated"));
           action.getInvalidFields().put("input-deliverable.deliverableInfo.status.duplicated",
             action.getText("deliverable.status.duplicated"));

diff --git a/marlo-web/src/main/resources/custom/aicrra.properties b/marlo-web/src/main/resources/custom/aicrra.properties
@@ -1841,7 +1841,7 @@ CrpProgram.message.concurrence=This section is currently being modified by {0}.
 CrpProgram.help=Enter members of the PTF management team and indicate whether or not your PTF is organized into Regional Programs. Everyone listed in this section will have the same level of user rights in AICCRA.
 CrpProgram.allowBaseline=Tick this box for allowing planning/reporting Baseline indicators
 # Users per CRP
-crpUsers.help=This section lists all the users that can login into your CRP
+crpUsers.help=This section lists all the users that can login into MARLO AICCRA
 crpGuestUsers.help=This section allows to create a new users with <b>Guest Role</b> and the assignment of this role to existing users.</br>The <b>First Name</b> and <b>Last Name</b> fields are required only for non-CGIAR users. For domain users, this information will be obtained from the active directory.
 crpUsers.title=List of users
 #

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/admin/crpUsers.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/admin/crpUsers.ftl
@@ -1,5 +1,5 @@
 [#ftl]
-[#assign title = "CRP Users" /]
+[#assign title = "Users" /]
 [#assign currentSectionString = "${actionName?replace('/','-')}-phase-${(actualPhase.id)!}" /]
 [#assign pageLibs = ["select2", "datatables.net", "datatables.net-bs"] /]
 [#assign customJS = [