From 2be59bbe0254dc1475b8474108f48a709b064504 Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Wed, 21 Apr 2021 18:14:16 +0300 Subject: [PATCH] Fix issues preventing rendering and functioning of temporal graph. Resolve https://jira.lyrasis.org/browse/VIVO-1978 (#235) --- .../main/webapp/js/visualization/entitycomparison/util.js | 4 ++-- .../entitycomparison/entityComparisonSetup.ftl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js index 1e081393..0e754460 100644 --- a/webapp/src/main/webapp/js/visualization/entitycomparison/util.js +++ b/webapp/src/main/webapp/js/visualization/entitycomparison/util.js @@ -1069,7 +1069,7 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){ // console.log(processJSONData.currentEntityLevel); - if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") { + if (processJSONData.currentEntityLevel === i18nStringsGuiEvents.organizationsAndPeople) { $.fn.dataTableExt.afnFiltering.push(DatatableCustomFilters.peopleOrOrganizations); } @@ -1193,7 +1193,7 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){ */ function reloadDataTablePagination(preselectedEntityURIs, jsonData){ - if (processJSONData.currentEntityLevel.toUpperCase() === "ORGANIZATIONS AND PEOPLE") { + if (processJSONData.currentEntityLevel === i18nStringsGuiEvents.organizationsAndPeople) { /* * This will make sure that duplicate filters are not added. diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl index fd4b7b4b..fac30ed6 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl @@ -34,7 +34,7 @@ <#assign temporalGraphDownloadCSVCommonURL = '${urls.base}${dataVisualizationURLRoot}?uri=${organizationURI}&labelField=label'> -<#assign publicationParameter = { "name": "${i18n().publication?js_string}", +<#assign publicationParameter = { "name": "publication", "pluralName": "${i18n().publications?js_string}", "verbName": "${i18n().published?js_string}", "dropDownText": "${i18n().by_publications?js_string}", @@ -44,7 +44,7 @@ "csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_comparison", "value": "${i18n().publications?js_string}" }> -<#assign grantParameter = { "name": "${i18n().grant?js_string}", +<#assign grantParameter = { "name": "grant", "pluralName": "${i18n().grants?js_string}", "verbName": "${i18n().granted?js_string}", "dropDownText": "${i18n().by_grants?js_string}", @@ -74,7 +74,7 @@ var activitiesLabel = { plural: '${i18n().activities?js_string}' }; var i18nStringsGuiEvents = { - temporalGraphCapped: '${i18n().temporal_graph_capitalized?js_string?js_string}, + temporalGraphCapped: '${i18n().temporal_graph_capitalized?js_string?js_string}', temporalGraphLower: '${i18n().temporal_graph?js_string?js_string}', viewString: '${i18n().view?js_string}', entityMaxNote: '${i18n().max_entity_note?js_string}',