From 025f2dd8ecea2c4352eaf01a8b51e0ab6d475407 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 19 Nov 2013 15:49:41 -0500 Subject: [PATCH 1/2] VIVO-548 Make unit tests independent of file separator characters. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By converting Strings to Paths before comparing, we should get consistent usage of “/“ and “\” --- .../loader/FreemarkerTemplateLoaderTest.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoaderTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoaderTest.java index 5b4d8b40d..89ae79cbf 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoaderTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/freemarker/loader/FreemarkerTemplateLoaderTest.java @@ -266,20 +266,19 @@ public class FreemarkerTemplateLoaderTest { * @throws IOException */ private void assertMatches(String searchTerm, int expectedHowMany, - String expectedBestFit) { + String expectedBestFitString) { + Path expectedBestFit = (expectedBestFitString == null) ? null : Paths + .get(expectedBestFitString); + SortedSet matches = runTheVisitor(searchTerm); int actualHowMany = matches.size(); - String actualBestFit = matches.isEmpty() ? null : matches.last().path - .toString(); + Path actualBestFit = matches.isEmpty() ? null : matches.last().path; if (expectedHowMany != actualHowMany) { fail("How many results: expected " + expectedHowMany + ", but was " + actualHowMany + ": " + matches); } - if (!StringUtils.equals(expectedBestFit, actualBestFit)) { - fail("Best result: expected '" + expectedBestFit + "', but was '" - + actualBestFit + "': " + matches); - } + assertEquals("Best result", expectedBestFit, actualBestFit); } /** From b3c5892679a719be2e7db099d78fcb5e63730643 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 19 Nov 2013 16:45:13 -0500 Subject: [PATCH 2/2] VIVO-541 Add a link on the Site Admin page to activate the developer panel. --- webapp/languages/es_GO/i18n/all_es_GO.properties | 3 +++ .../controller/freemarker/BaseSiteAdminController.java | 4 ++++ webapp/web/i18n/all.properties | 3 +++ webapp/web/js/developer/developerPanel.js | 9 +++++---- .../body/siteAdmin/siteAdmin-indexCacheRebuild.ftl | 4 ++++ 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/webapp/languages/es_GO/i18n/all_es_GO.properties b/webapp/languages/es_GO/i18n/all_es_GO.properties index 8c8d081a5..85e25c9cf 100644 --- a/webapp/languages/es_GO/i18n/all_es_GO.properties +++ b/webapp/languages/es_GO/i18n/all_es_GO.properties @@ -481,6 +481,9 @@ restrict_logins_mixed_caps = Restringir conexiones site_information = Información del sitio user_accounts = Las cuentas de usuario +activate_developer_panel = Activar el panel desarrollador +activate_developer_panel_mixed_caps = Activar el panel desarrollador + # # search controller ( PagedSearchController.java ) # diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java index 69d25aa44..fd988add8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java @@ -73,6 +73,10 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet { urls.put("rebuildSearchIndex", UrlBuilder.getUrl("/SearchIndex")); } + if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.ENABLE_DEVELOPER_PANEL.ACTIONS)) { + urls.put("activateDeveloperPanel", "javascript:new DeveloperPanel(developerAjaxUrl).setupDeveloperPanel({developerEnabled: true});"); + } + return urls; } diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties index 8bc0a1aeb..336d1fefc 100644 --- a/webapp/web/i18n/all.properties +++ b/webapp/web/i18n/all.properties @@ -493,6 +493,9 @@ restrict_logins_mixed_caps = Restrict logins site_information = Site information user_accounts = User accounts +activate_developer_panel = Activate developer panel +activate_developer_panel_mixed_caps = Activate developer panel + # # search controller ( PagedSearchController.java ) # diff --git a/webapp/web/js/developer/developerPanel.js b/webapp/web/js/developer/developerPanel.js index a432d710f..8c0c9a2b1 100644 --- a/webapp/web/js/developer/developerPanel.js +++ b/webapp/web/js/developer/developerPanel.js @@ -1,9 +1,9 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ - function DeveloperPanel(developerAjaxUrl) { - this.setupDeveloperPanel = updateDeveloperPanel; - - function updateDeveloperPanel(data) { +function DeveloperPanel(developerAjaxUrl) { + this.setupDeveloperPanel = updateDeveloperPanel; + + function updateDeveloperPanel(data) { $.ajax({ url: developerAjaxUrl, dataType: "json", @@ -79,3 +79,4 @@ $(document).ready(function() { new DeveloperPanel(developerAjaxUrl).setupDeveloperPanel({}); }); + diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl index 87adb5232..c2317ce27 100644 --- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl +++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl @@ -18,6 +18,10 @@ <#if indexCacheRebuild.recomputeInferences?has_content>
  • ${i18n().recompute_inferences_mixed_caps}
    • + + <#if indexCacheRebuild.activateDeveloperPanel?has_content> +
  • ${i18n().activate_developer_panel_mixed_caps}
    • + \ No newline at end of file