diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index 272dcdb1c..b7e733705 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java @@ -407,9 +407,6 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { // Let the page template know which page it's processing. map.put("currentServlet", normalizeServletName(vreq.getServletPath().replaceFirst("/", ""))); - - // Allow template to send domain name to JavaScript (needed for AJAX calls) - map.put("requestedPage", vreq.getRequestURL().toString()); // In template: ${now?date}, ${now?datetime}, ${now?time} map.put("now", new Date()); diff --git a/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl b/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl index d8ab5ecf1..d04d9e5ae 100644 --- a/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl +++ b/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl @@ -63,18 +63,11 @@ ${stylesheets.add("/css/browseClassGroups.css")} - <#---------------------------------------------------------------------------------- - requestedPage is currently provided by FreemarkerHttpServlet. Should this be moved - to PageController? Maybe we should have Java provide the domain name directly - instead of the full URL of the requested page? Chintan was also asking for a - template variable with the domain name for an AJAX request with visualizations. - ------------------------------------------------------------------------------------> - <#assign domainName = requestedPage?substring(0, requestedPage?index_of("/", 7)) /> - + <#-- For v1.3: The controller should pass in the dataservice url. -->