#9507 prelim check in

IQSS · Oct 2, 2023 · cb1f3e6 · cb1f3e6
1 parent fa97a76
commit cb1f3e6
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -61,6 +61,7 @@
 import edu.harvard.iq.dataverse.util.WebloaderUtil;
 import edu.harvard.iq.dataverse.validation.URLValidator;
 import edu.harvard.iq.dataverse.workflows.WorkflowComment;
+import edu.harvard.iq.dataverse.Dataverse;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -3423,7 +3424,23 @@ private Boolean saveLink(Dataverse dataverse){
         }
         return retVal;
     }
-
+
+    private String alreadyLinkedDataverses = null;
+
+    public String getAlreadyLinkedDataverses(){
+        if (alreadyLinkedDataverses != null) {           
+            return alreadyLinkedDataverses;
+        }
+        List<Dataverse> dataverseList = dataverseService.findDataversesThatLinkToThisDatasetId(dataset.getId());
+        for (Dataverse dv: dataverseList){
+            if (alreadyLinkedDataverses == null){
+                alreadyLinkedDataverses = dv.getCurrentName();
+            } else {
+                alreadyLinkedDataverses = alreadyLinkedDataverses + ", " + dv.getCurrentName();
+            }
+        }
+        return alreadyLinkedDataverses;
+    }
 
     public List<Dataverse> completeLinkingDataverse(String query) {
         dataset = datasetService.find(dataset.getId());

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
@@ -2494,6 +2494,7 @@ dataset.registered=DatasetRegistered
 dataset.registered.msg=Your dataset is now registered.
 dataset.notlinked=DatasetNotLinked
 dataset.notlinked.msg=There was a problem linking this dataset to yours:
+dataset.linking.popop.already.linked.note=Note: the dataset is already linked to the following dataverses: 
 datasetversion.archive.success=Archival copy of Version successfully submitted
 datasetversion.archive.failure=Error in submitting an archival copy 
 datasetversion.update.failure=Dataset Version Update failed. Changes are still in the DRAFT version.

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -1598,6 +1598,14 @@
                                 </div>
                             </div>
                         </div>
+                        <div>
+                            <p:outputLabel rendered="#{!empty DatasetPage.alreadyLinkedDataverses }" >
+                         #{bundle.dataset.linking.popop.already.linked.note}
+                            </p:outputLabel>
+                            <h:outputText rendered="#{!empty DatasetPage.alreadyLinkedDataverses }">
+                            #{DatasetPage.alreadyLinkedDataverses}
+                            </h:outputText>
+                        </div>
                         <div class="button-block">
                             <p:commandButton id="saveLinkButton" styleClass="btn btn-default"    
                                              update="linkNameContent @([id$=Messages])"