Skip to content

6258 cancel edit dataverse causes empty page #6299

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

Merged
kcondon merged 3 commits into from
Oct 21, 2019
Merged

6258 cancel edit dataverse causes empty page #6299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93f29a3
Merge branch 'develop' into 6258-cancel-edit-dataverse-causes-empty-page
sekmiller Oct 18, 2019
2e083e2
#6258 reset page after cancel edit
sekmiller Oct 21, 2019
a79248a
Merge branch 'develop' into 6258-cancel-edit-dataverse-causes-empty-page
sekmiller Oct 21, 2019
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
3 changes: 2 additions & 1 deletion src/main/java/edu/harvard/iq/dataverse/DataversePage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,11 +660,12 @@ public String save() {
}
}

public void cancel(ActionEvent e) {
public String cancel() {
// reset values
dataverse = dataverseService.find(dataverse.getId());
ownerId = dataverse.getOwner() != null ? dataverse.getOwner().getId() : null;
editMode = null;
return "/dataverse.xhtml?alias=" + dataverse.getAlias() + "&faces-redirect=true";
}

public boolean isRootDataverse() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/dataverse.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@
<p:commandButton id="save" styleClass="btn btn-default" tabindex="9" value="#{DataversePage.dataverse.id == null ? bundle.createDataverse : bundle.saveChanges}" action="#{DataversePage.save}" update="@all">
<f:ajax onerror="window.scrollTo(0, 0)" />
</p:commandButton>
<p:commandButton id="cancel" styleClass="btn btn-link" tabindex="10" value="#{bundle.cancel}" actionListener="#{DataversePage.cancel}" process="@this" update="@form,:searchResults,:messagePanel" rendered="#{DataversePage.dataverse.id != null}" oncomplete="javascript:bind_bsui_components();initCarousel();"/>
<p:commandButton id="cancel" styleClass="btn btn-link" tabindex="10" value="#{bundle.cancel}" action="#{DataversePage.cancel}" rendered="#{DataversePage.dataverse.id != null}"/>
<p:button id="cancelCreate" styleClass="btn btn-link" tabindex="10" value="#{bundle.cancel}" outcome="/dataverse.xhtml?alias=#{DataversePage.dataverse.owner.alias}" rendered="#{DataversePage.dataverse.id == null and DataversePage.ownerId != null}"/>
</div>

Expand Down