Skip to content

Refactor use of DataverseServiceBean.getApplicationVersion (fixes #1579) #2877

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
scolapasta merged 2 commits into from
Feb 29, 2016
Merged

Refactor use of DataverseServiceBean.getApplicationVersion (fixes #1579) #2877

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
8f2d3bc
Refactor use of DataverseServiceBean.getApplicationVersion (fixes #1579)
bencomp Jan 15, 2016
cb9f527
Add argument 'true' to SystemConfig.getVersion in XHTML
bencomp Jan 16, 2016
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
11 changes: 0 additions & 11 deletions src/main/java/edu/harvard/iq/dataverse/DataverseServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,17 +221,6 @@ public DataverseFacet findFacet(Long id) {

public List<DataverseFacet> findAllDataverseFacets() {
return em.createQuery("select object(o) from DataverseFacet as o order by o.display").getResultList();
}

private String appVersionString;

/**
* @todo Remove this method, and make all the (a couple of) xhtml pages
* call the SystemConfig.getVersion method directly
* (I don't have time to do it now -- L.A. 4.0.2)
*/
public String getApplicationVersion() {
return systemConfig.getVersion(true);
}

public String getDataverseLogoThumbnailAsBase64(Dataverse dataverse, User user) {
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ public class SystemConfig {
*/
private static final int defaultZipUploadFilesLimit = 1000;

/**
* @todo Reconcile with getApplicationVersion on DataverseServiceBean.java
* which we'd like to move to this class.
*/
private static String appVersionString = null;
private static String buildNumberString = null;

Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/dataverse_template.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<div class="poweredbylogo">
<span>#{bundle['footer.poweredby']}</span>
<a href="http://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank"><img src="/resources/images/dataverseproject_logo.jpg" alt="#{bundle['footer.dataverseProject']}" /></a>
<span class="version">v. #{dataverseServiceBean.applicationVersion}</span>
<span class="version">v. #{systemConfig.getVersion(true)}</span>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/passwordreset.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
<div class="row" jsf:rendered="#{PasswordResetPage.isAccountUpgrade()}">
<div class="col-sm-12">
<h:outputFormat styleClass="h2 text-info show" value="#{bundle['user.updatePassword.welcome']}">
<f:param value="#{dataverseServiceBean.applicationVersion}"/>
<f:param value="#{PasswordResetPage.user.displayInfo.title}"/>
<f:param value="#{systemConfig.getVersion(true)}"/>
<f:param value="#{PasswordResetPage.user.displayInfo.title}"/>
</h:outputFormat>
<p class="help-block"><span class="text-danger"><span class="glyphicon glyphicon-warning-sign"/> #{bundle['user.updatePassword.warning']}</span></p>
</div>
Expand Down