fixed the problem with closing the rsync popup via the 'x' checkbox. #…

…3348
IQSS · Sep 8, 2017 · 4d65715 · 4d65715
1 parent e43c5f9
commit 4d65715
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -97,6 +97,7 @@
 import org.apache.commons.lang.StringEscapeUtils;
 
 import org.primefaces.component.tabview.TabView;
+import org.primefaces.event.CloseEvent;
 import org.primefaces.event.TabChangeEvent;
 
 /**
@@ -3976,6 +3977,10 @@ public void downloadRsyncScript() {
 
     }
 
+    public void closeRsyncScriptPopup(CloseEvent event) {
+        finishRsyncScriptAction();
+    }
+
     public String finishRsyncScriptAction() { 
         // This method is called when the user clicks on "Close" in the "Rsync Upload" 
         // popup. If they have successfully downloaded the rsync script, the 

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -1105,6 +1105,7 @@
 
                     <p:dialog id="rsyncUploadInfoPopup" styleClass="smallPopUp" header="#{bundle['file.uploadFiles']}" widgetVar="rsyncUpload_popup" modal="true">
                         <!-- RSYNC UPLOAD POPUP -->
+                        <p:ajax event="close" update=":datasetForm,:messagePanel" listener="#{DatasetPage.closeRsyncScriptPopup}" />
                         <ui:fragment rendered="#{DatasetPage.workingVersion.fileMetadatas.size() > 0}">
                             <p class="help-block">
                                 <span class="glyphicon glyphicon-warning-sign text-danger"></span>