Merge pull request #876 from cjuergen/DS-2482

Fix for DS-2482
DSpace · Apr 8, 2015 · 8a5ecc0 · 8a5ecc0
2 parents f809f36 + 682c05b
commit 8a5ecc0
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/HandleServlet.java b/dspace-jspui/src/main/java/org/dspace/app/webui/servlet/HandleServlet.java
@@ -160,12 +160,32 @@ protected void doDSGet(Context context, HttpServletRequest request,
             // and firing a usage event for the DSO we're reporting for
             return;
         } else if ("/browse".equals((extraPathInfo)) || StringUtils.startsWith(extraPathInfo, "/browse?")) {
+        	// Add the location if we got a community or collection
+        	if (dso instanceof Community)
+        	{
+        		Community c = (Community) dso;
+        		request.setAttribute("dspace.community", c);
+        	} else if (dso instanceof Collection)
+        	{
+        		Collection c = (Collection) dso;
+        		request.setAttribute("dspace.collection", c);
+        	}
             request.getRequestDispatcher(extraPathInfo).forward(request, response);
             // If we don't return here, we keep processing and end up
             // throwing a NPE when checking community authorization
             // and firing a usage event for the DSO we're reporting for
             return;
         } else if ("/simple-search".equals(extraPathInfo) || StringUtils.startsWith(extraPathInfo, "simple-search?")) {
+        	// Add the location if we got a community or collection
+        	if (dso instanceof Community)
+        	{
+        		Community c = (Community) dso;
+        		request.setAttribute("dspace.community", c);
+        	} else if (dso instanceof Collection)
+        	{
+        		Collection c = (Collection) dso;
+        		request.setAttribute("dspace.collection", c);
+        	}
             request.getRequestDispatcher(extraPathInfo).forward(request, response);
             // If we don't return here, we keep processing and end up
             // throwing a NPE when checking community authorization