Merge branch 'aiccra-staging' into aiccra-dev

CCAFS · Jan 23, 2024 · 1482cc9 · 1482cc9
2 parents 1f4dd47 + c973dfc
commit 1482cc9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
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
@@ -417,7 +417,8 @@ public void validate(BaseAction action, Deliverable deliverable, boolean saving)
              */
             // Deliverable Quality Check
             if (deliverable.getDeliverableInfo(action.getActualPhase()).getDeliverableType() != null
-              && (deliverable.getDeliverableInfo(action.getActualPhase()).getDeliverableType().getId().intValue() == 51
+              && (deliverable.getDeliverableInfo(action.getActualPhase()).getDeliverableType().getId() != null
+                && deliverable.getDeliverableInfo(action.getActualPhase()).getDeliverableType().getId().intValue() == 51
                 || deliverable.getDeliverableInfo(action.getActualPhase()).getDeliverableType().getId()
                   .intValue() == 74)) {
               if (deliverable.getQualityCheck() != null) {

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
@@ -3,7 +3,7 @@
 [#assign currentSectionString = "project-${actionName?replace('/','-')}-${deliverableID}-phase-${(actualPhase.id)!}" /]
 [#assign pageLibs = ["select2","font-awesome","dropzone","blueimp-file-upload","jsUri", "flag-icon-css", "pickadate", "vue"] /]
 [#assign customJS = [
-  "${baseUrlMedia}/js/projects/deliverables/deliverableInfo.js?20230420",
+  "${baseUrlMedia}/js/projects/deliverables/deliverableInfo.js?20240123",
   "${baseUrlMedia}/js/projects/deliverables/deliverableDissemination.js?20230810",
   "${baseUrlMedia}/js/projects/deliverables/deliverableQualityCheck.js?20220721",
   "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20231017",

diff --git a/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableInfo.js b/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableInfo.js
@@ -579,7 +579,7 @@ function validateDeliverableStatus() {
       $statuses.find('option').prop("disabled", true); // Disable All
       $statuses.find('option[value="3"]').prop("disabled", false); // Enable Complete
       $statuses.find('option[value="5"]').prop("disabled", false); // Enable Cancelled
-      $statuses.val("3"); // Set Complete
+      //$statuses.val("3"); // Set Complete
     } else {
       $statuses.find('option[value="2"]').prop("disabled", true);// Disable On-going
     }