Merge pull request #2497 from CCAFS/A2-87-Bug-in-Dissemination-Metadata

A2 87 bug in dissemination metadata
CCAFS · Mar 22, 2024 · 650830a · 650830a
2 parents 4cf99f4 + 5bc447d
commit 650830a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
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
@@ -5,7 +5,7 @@
 [#assign customJS = [
   "${baseUrlMedia}/js/projects/deliverables/deliverableInfo.js?20240123",
   "${baseUrlMedia}/js/projects/deliverables/deliverableShfrm.js?20240226",
-  "${baseUrlMedia}/js/projects/deliverables/deliverableDissemination.js?20230810",
+  "${baseUrlMedia}/js/projects/deliverables/deliverableDissemination.js?20240322",
   "${baseUrlMedia}/js/projects/deliverables/deliverableQualityCheck.js?20220721",
   "${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20240313",
   [#--  "${baseUrlMedia}/js/projects/deliverables/deliverableDataSharing.js?20180523",--]

diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/publications/publication.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/publications/publication.ftl
@@ -6,7 +6,7 @@
   "${baseUrlMedia}/js/publications/publication.js?20190228",
   "${baseUrlMedia}/js/projects/deliverables/deliverableQualityCheck.js?20190228", 
   "${baseUrlMedia}/js/projects/deliverables/deliverableInfo.js?20230417",
-  "${baseUrlMedia}/js/projects/deliverables/deliverableDissemination.js?20230810",
+  "${baseUrlMedia}/js/projects/deliverables/deliverableDissemination.js?20240322",
   [#-- "${baseUrlCdn}/global/js/autoSave.js",--]
   "${baseUrlCdn}/global/js/fieldsValidation.js?20180529"
 ] /]

diff --git a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
@@ -575,7 +575,7 @@
 [#macro findableOptions ]
   [#local isSynced = (deliverable.dissemination.synced)!false ]
   [#local customName = "deliverable.dissemination" /]
-  <div class="disseminationChannelBlock" style="display:${isSynced?string('none','block')};">
+  <div class="disseminationChannelBlock" >
     [#-- Note 
     <div class="note">[@s.text name="project.deliverable.dissemination.channelInfo" /]</div>
     --]

diff --git a/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableDissemination.js b/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableDissemination.js
@@ -751,7 +751,9 @@ function updateReadOnly() {
     if ($('.deliverableDisseminationUrl ').prop('readonly')) {
       getWOSInfo();
     }
-    //if not
+    $('select[name="deliverable.dissemination.disseminationChannel"]').prop("disabled",true);
+    $('select').select2();
+  //if not
   } else {
 
     $('.WOS_tag').hide("slow");
@@ -788,6 +790,8 @@ function updateReadOnly() {
         hideOrShowCheckBoxIsOtherUrl(true);
       }
     }
+    $('select[name="deliverable.dissemination.disseminationChannel"]').prop("disabled",false);
+    $('select').select2();
 
   }
 
@@ -1482,8 +1486,8 @@ function setLicense(license) {
  * Sync the deliverable in the interface and set as synced
  */
 function syncDeliverable() {
-  // Hide Sync Button & dissemination channel
-  $('#fillMetadata .checkButton, .disseminationChannelBlock').hide('slow');
+  // Hide Sync Button
+  $('#fillMetadata .checkButton').hide('slow');
   // Show UnSync & Update Button
   $('#fillMetadata .unSyncBlock').show();
   // Set hidden inputs