From 6e173e5815e52e6f6c33b58ab2801d0943264872 Mon Sep 17 00:00:00 2001 From: grahamtriggs Date: Mon, 2 Nov 2015 18:32:37 +0000 Subject: [PATCH] Enable new visualisations by default --- config/example.runtime.properties | 9 +++++---- .../personlevel/PersonLevelRequestHandler.java | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/example.runtime.properties b/config/example.runtime.properties index 9225a724..869a52e1 100644 --- a/config/example.runtime.properties +++ b/config/example.runtime.properties @@ -224,7 +224,8 @@ VitroConnection.DataSource.validationQuery = SELECT 1 # The embed code will use a DOI, or PubMed ID, if present # Enable AltMetric badges -resource.altmetric=enabled + # Uncomment and set this to disabled if you don't want AltMetric badges +#resource.altmetric=disabled # Display the badge to the left or right of the title (default = right) # Options: left, right @@ -318,9 +319,9 @@ visualization.temporal = enabled # modern browser. # Currently, it is not possible to choose between them from the UI. You can choose to either have # the Flash visualizations, OR the D3 visualizations. - # If this option is not present or set to disabled, then the Flash visualizations will be used. - # If this option is present and set to enabled, then the D3 visualizations will be used. -visualization.d3 = enabled + # If this option is not present or set to enabled, then the D3 visualizations will be used. + # If this option is present and set to disabled, then the Flash visualizations will be used. +#visualization.d3 = disabled # # Types of individual for which we can create proxy editors. diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java index 622b5ae4..289d9f65 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java @@ -224,7 +224,7 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler { String standaloneTemplate = "coAuthorPersonLevel.ftl"; String property = ConfigurationProperties.getBean(vitroRequest).getProperty("visualization.d3"); - if ("enabled".equalsIgnoreCase(property)) { + if (!"disabled".equalsIgnoreCase(property)) { body.put("coAuthorshipData", new CollaborationDataViewHelper(coAuthorshipVO)); standaloneTemplate = "coAuthorPersonLevelD3.ftl"; } @@ -286,7 +286,7 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler { String standaloneTemplate = "coPIPersonLevel.ftl"; String property = ConfigurationProperties.getBean(vitroRequest).getProperty("visualization.d3"); - if ("enabled".equalsIgnoreCase(property)) { + if (!"disabled".equalsIgnoreCase(property)) { body.put("coInvestigatorData", new CollaborationDataViewHelper(coPIVO)); standaloneTemplate = "coPIPersonLevelD3.ftl"; }