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

6216 - Repair broken dataverse view #6220

Closed
wants to merge 2 commits into from
Closed

6216 - Repair broken dataverse view #6220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d42d00d
Upgrade to Omnifaces 2.7.1. Latest release available for JSF 2.2. Rel…
poikilotherm Sep 25, 2019
931b1e6
Handling dataverse viewParam alias and id as class vars.
poikilotherm Sep 25, 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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
See https://github.com/jacoco/jacoco/issues/772 for discussion of how the XML changed.
-->
<jacoco.version>0.8.1</jacoco.version>
<omnifaces.version>2.7.1</omnifaces.version>
</properties>
<!--Maven checks for dependendies from these repos in the order shown in the pom.xml
This isn't well documented and seems to change between maven versions -MAD 4.9.4 -->
Expand Down Expand Up @@ -292,7 +293,7 @@
<dependency>
<groupId>org.omnifaces</groupId>
<artifactId>omnifaces</artifactId>
<version>1.7</version> <!-- Or 1.8-SNAPSHOT -->
<version>${omnifaces.version}</version> <!-- Or 1.8-SNAPSHOT -->
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
Expand Down
29 changes: 21 additions & 8 deletions 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 @@ -107,10 +107,16 @@ public enum LinkMode {
@Inject PermissionsWrapper permissionsWrapper;

private Dataverse dataverse = new Dataverse();

/**
* View parameters
*/
private Long id = null;
private String alias = null;
private Long ownerId = null;
private EditMode editMode;
private LinkMode linkMode;

private Long ownerId;

private DualListModel<DatasetFieldType> facets = new DualListModel<>(new ArrayList<>(), new ArrayList<>());
private DualListModel<Dataverse> featuredDataverses = new DualListModel<>(new ArrayList<>(), new ArrayList<>());
private List<Dataverse> dataversesForLinking;
Expand Down Expand Up @@ -247,6 +253,12 @@ public Dataverse getDataverse() {
public void setDataverse(Dataverse dataverse) {
this.dataverse = dataverse;
}

public Long getId() { return this.id; }
public void setId(Long id) { this.id = id; }

public String getAlias() { return this.alias; }
public void setAlias(String alias) { this.alias = alias; }

public EditMode getEditMode() {
return editMode;
Expand All @@ -266,12 +278,13 @@ public void setOwnerId(Long ownerId) {

public String init() {
//System.out.println("_YE_OLDE_QUERY_COUNTER_"); // for debug purposes

if (dataverse.getAlias() != null || dataverse.getId() != null || ownerId == null) {// view mode for a dataverse
if (dataverse.getAlias() != null) {
dataverse = dataverseService.findByAlias(dataverse.getAlias());
} else if (dataverse.getId() != null) {
dataverse = dataverseService.find(dataverse.getId());

// TODO: all these parameters should be validated to be matching names (regex) or null
if (this.getAlias() != null || this.getId() != null || this.getOwnerId() == null) {// view mode for a dataverse
if (this.getAlias() != null) {
dataverse = dataverseService.findByAlias(this.getAlias());
} else if (this.getId() != null) {
dataverse = dataverseService.find(this.getId());
} else {
try {
dataverse = dataverseService.findRootDataverse();
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/dataverse.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</ui:define>
<ui:define name="body">
<f:metadata>
<f:viewParam name="id" value="#{DataversePage.dataverse.id}"/>
<f:viewParam name="alias" value="#{DataversePage.dataverse.alias}"/>
<f:viewParam name="id" value="#{DataversePage.id}"/>
<f:viewParam name="alias" value="#{DataversePage.alias}"/>
<f:viewParam name="ownerId" value="#{DataversePage.ownerId}"/>
<f:viewParam name="editMode" value="#{DataversePage.editMode}"/>
<f:viewAction action="#{dataverseSession.updateLocaleInViewRoot}"/>
Expand Down