Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#9650 list the linked dataverse in the link edit form #9661

Closed
wants to merge 1 commit into from
Closed

#9650 list the linked dataverse in the link edit form #9661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3341,6 +3341,14 @@ public List<Dataverse> completeLinkingDataverse(String query) {
}
}

public List<Dataverse> getLinkedDataverses() {
List<Dataverse> linkedDataverses = new ArrayList<>();
if (session.getUser().isAuthenticated()) {
linkedDataverses = dataverseService.findDataversesThatLinkToThisDatasetId(dataset.getId());
}
return linkedDataverses;
}

public List<Dataverse> completeHostDataverseMenuList(String query) {
if (session.getUser().isAuthenticated()) {
return dataverseService.filterDataversesForHosting(query, dvRequestService.getDataverseRequest());
Expand Down
1 change: 1 addition & 0 deletions src/main/java/propertyFiles/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1470,6 +1470,7 @@ dataset.viewVersion.unpublished=View Unpublished Version
dataset.viewVersion.published=View Published Version
dataset.link.title=Link Dataset
dataset.link.save=Save Linked Dataset
dataset.link.list=List of linked dataverses
dataset.link.not.to.owner=Can't link a dataset to its dataverse
dataset.link.not.to.parent.dataverse=Can't link a dataset to its parent dataverses
dataset.link.not.published=Can't link a dataset that has not been published
Expand Down
12 changes: 12 additions & 0 deletions src/main/webapp/dataset.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1612,6 +1612,18 @@
#{bundle.cancel}
</button>
</div>
<p:fragment id="linkedDataversesList" rendered="#{!empty DatasetPage.linkedDataverses}">
<p style="margin-top: 10px; margin-bottom: 0;"><strong><h:outputText value="#{bundle['dataset.link.list']}" escape="false" /></strong></p>
<ul style="margin-top: 0; padding-top: 0;">
<ui:repeat value="#{DatasetPage.linkedDataverses}" var="linkedDataverse">
<li>
<a href="/dataverse/#{linkedDataverse.alias}">
<h:outputText value="#{linkedDataverse.displayName}" />
</a>
</li>
</ui:repeat>
</ul>
</p:fragment>
</p:dialog>
<p:remoteCommand name="linkDatasetCommand" oncomplete="PF('linkDatasetForm').hide();" update=":messagePanel @([id$=Messages])" actionListener="#{DatasetPage.saveLinkingDataverses}"/>
<p:dialog id="computeBatchListPopup" header="#{bundle['dataset.compute.computeBatchListHeader']}" widgetVar="computeBatchListPopup" modal="true">
Expand Down