litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1234 Handle routing of a request for the home page to the HomePageController by forwarding from TabController

Browse source
This commit is contained in:
rjy7 2010-10-28 15:09:17 +00:00
parent ce99295729
commit fababdd9d2
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/config/web.xml
View file

@ -343,9 +343,9 @@
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>HomePageController</servlet-name> <servlet-name>HomePageController</servlet-name>
<url-pattern>/index.jsp</url-pattern> <url-pattern>/home</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet> <servlet>
<servlet-name>FreemarkerTestController</servlet-name> <servlet-name>FreemarkerTestController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController</servlet-class> <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController</servlet-class>

6
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabController.java
View file

@ -54,7 +54,11 @@ public class TabController extends VitroHttpServlet {
if (leadingTab.getTabId()==portal.getRootTabId()) { if (leadingTab.getTabId()==portal.getRootTabId()) {
request.setAttribute("homePageRequested", "true"); request.setAttribute("homePageRequested", "true");
request.setAttribute("title",portal.getAppName()); request.setAttribute("title", portal.getAppName());
// This will break Datastar, but this may be gone by the time Datastar integrates new Vitro code
RequestDispatcher rd = request.getRequestDispatcher("/home");
rd.forward(request, response);
return;
} }
else else
request.setAttribute("title",leadingTab.getTitle()); request.setAttribute("title",leadingTab.getTitle());

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java
View file

@ -436,7 +436,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
map.put("bannerImage", UrlBuilder.getUrl(themeDir + "site_icons/" + bannerImage)); map.put("bannerImage", UrlBuilder.getUrl(themeDir + "site_icons/" + bannerImage));
} }
map.put("version", getVersionInfo(urlBuilder)); map.put("version", getRevisionInfo(urlBuilder));
return map; return map;
} }
@ -480,7 +480,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
return copyright; return copyright;
} }
private final Map<String, Object> getVersionInfo(UrlBuilder urlBuilder) { private final Map<String, Object> getRevisionInfo(UrlBuilder urlBuilder) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("label", RevisionInfoBean.getBean(getServletContext()) map.put("label", RevisionInfoBean.getBean(getServletContext())
.getReleaseLabel()); .getReleaseLabel());

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
View file

@ -22,7 +22,7 @@ public class HomePageController extends FreemarkerHttpServlet {
private static final String BODY_TEMPLATE = "home.ftl"; private static final String BODY_TEMPLATE = "home.ftl";
@Override @Override
protected ResponseValues processRequest(VitroRequest vreq) { protected ResponseValues processRequest(VitroRequest vreq) {
Map<String, Object> body = new HashMap<String, Object>(); Map<String, Object> body = new HashMap<String, Object>();
// Add home page data to body here // Add home page data to body here