make ingest link consistent and dynamic #8096

We decided the "dataset management" page has more context. Previously, the standard guides server base URL and "latest" was hard coded.
IQSS · Dec 15, 2021 · 5326400 · 5326400
1 parent 65c9fcd
commit 5326400
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -5805,4 +5805,9 @@ private boolean containsOnlyActivelyEmbargoedFiles(List<FileMetadata> selectedFi
         }
         return true;
     }
+
+    public String getIngestMessage() {
+        return BundleUtil.getStringFromBundle("file.ingestFailed.message", Arrays.asList(settingsWrapper.getGuidesBaseUrl(), settingsWrapper.getGuidesVersion()));
+    }
+
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/FilePage.java b/src/main/java/edu/harvard/iq/dataverse/FilePage.java
@@ -1100,4 +1100,9 @@ public String getEmbargoPhrase() {
             return BundleUtil.getStringFromBundle("embargoed.willbeuntil");
         }
     }
+
+    public String getIngestMessage() {
+        return BundleUtil.getStringFromBundle("file.ingestFailed.message", Arrays.asList(settingsWrapper.getGuidesBaseUrl(), settingsWrapper.getGuidesVersion()));
+    }
+
 }
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
@@ -1709,7 +1709,7 @@ file.spss-porExtraLabels=Variable Labels
 file.spss-porExtraLabels.title=Upload an additional text file with extra variable labels.
 file.spss-porExtraLabels.selectToAddBtn=Select File to Add
 file.ingestFailed.header=File available in original format only
-file.ingestFailed.message=<a href="https://guides.dataverse.org/en/latest/user/tabulardataingest/index.html" title="Tabular Data File Ingest - Dataverse User Guide" target="_blank">Tabular ingest</a> was unsuccessful.
+file.ingestFailed.message=<a href="{0}/{1}/user/dataset-management.html#tabular-data-files" title="Tabular Data Files - Dataverse User Guide" target="_blank">Tabular ingest</a> was unsuccessful.
 file.downloadBtn.format.all=All File Formats + Information
 file.downloadBtn.format.tab=Tab-Delimited
 file.downloadBtn.format.original={0} (Original File Format)

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -51,7 +51,7 @@
                                         <span>
                                             <a tabindex="0" role="button" class="glyphicon glyphicon-question-sign tooltip-icon"
                                                data-toggle="popover" data-placement="auto top" data-trigger="focus" data-html="true"
-                                               data-content="#{bundle['file.ingestFailed.message']} #{FilePage.fileMetadata.dataFile.ingestReportMessage}"/>
+                                               data-content="#{FilePage.ingestMessage} #{FilePage.fileMetadata.dataFile.ingestReportMessage}"/>
                                         </span>
                                     </div>
                                     <!-- END: FILE LEVEL MSGs -->

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
@@ -473,7 +473,7 @@
                 <span>
                     <a tabindex="0" role="button" class="glyphicon glyphicon-question-sign tooltip-icon"
                        data-toggle="popover" data-placement="auto top" data-trigger="focus" data-html="true"
-                       data-content="#{bundle['file.ingestFailed.message']} #{fileMetadata.dataFile.ingestReportMessage}"/>
+                       data-content="#{DatasetPage.ingestMessage} #{fileMetadata.dataFile.ingestReportMessage}"/>
                 </span>
             </div>
             <!-- END: FILE LEVEL MSGs -->