An attempt to display a flash success message, when an ingest completes.

IQSS · Mar 2, 2015 · 9039ecc · 9039ecc
1 parent e92a8f4
commit 9039ecc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -1071,6 +1071,7 @@ public void refresh() {
             workingVersion = datasetVersionService.find(versionId);
         }
         displayCitation = dataset.getCitation(false, workingVersion);
+        JsfHelper.addSuccessMessage(JH.localize("dataset.message.files.ingestSuccess"));
     }
 
     public String deleteDataset() {

diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
@@ -1420,9 +1420,9 @@ public boolean ingestAsTabular(String tempFileLocation, DataFile dataFile) { //t
                         dataFile.setIngestRequest(null);
                     }
                     dataFile = fileService.save(dataFile);
-                    FacesMessage facesMessage = new FacesMessage("ingest done");
+                    FacesMessage facesMessage = new FacesMessage("The file " + dataFile.getFileMetadata().getLabel() + " ingested.");
                     pushContext.push("/ingest" + dataFile.getOwner().getId(), facesMessage);
-                    logger.info("Ingest (" + dataFile.getFileMetadata().getDescription() + "); Sent push notification to the page.");
+                    logger.info("Ingest (" + dataFile.getFileMetadata().getLabel() + "); Sent push notification to the page.");
 
                     if (additionalData != null) {
                         // remove the extra tempfile, if there was one:

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -498,14 +498,15 @@
                     <ui:fragment rendered="#{DatasetPage.editMode != 'INFO'}">
                         <div id="contentTabs">
                             <ui:fragment> <!-- rendered="#{empty DatasetPage.editMode}" -->
-                                <p:commandButton id="refreshButton" widgetVar="refreshButton" actionListener="#{DatasetPage.refresh}" update="@all" style="display:none"/>
+                                <p:commandButton id="refreshButton" widgetVar="refreshButton" actionListener="#{DatasetPage.refresh}" update=":datasetForm:tabView:filesTable,:messagePanel" style="display:none"/>
                                 <script type="text/javascript">
                                     function updateFilesTable(facesmessage) {
+                                        //flash['successMsg'] = facesmessage.text; -- not working as expected - ? L.A.
                                         $('button[id$="refreshButton"]').trigger('click');
                                     }
                                 </script>
                                 <p:socket channel="/ingest#{dataset.id}" onMessage="updateFilesTable" autoConnect="true">
-                                    <p:ajax event="message" update="@all" />
+                                    <!-- p:ajax event="message" update="@all" / -->
                                 </p:socket>
                             </ui:fragment>
                             <p:tabView id="tabView" widgetVar="content" activeIndex="#{DatasetPage.selectedTabIndex}">