Commit 71608dc2935dcdf25b765d9a0d58bf7be9ad8c94

Authored by Tiago Guimarães
1 parent 95b012a6e1
Exists in researchcenters

removed map

dspace-jspui/src/main/webapp/researchcenters-list.jsp
... ... @@ -47,16 +47,14 @@
47 47  
48 48 <%
49 49 Set<Community> communities = new HashSet<Community>();
50   - Map collectionMap = (Map) request.getAttribute("collections.map");
51   - Map subcommunityMap = (Map) request.getAttribute("subcommunities.map");
52 50 Boolean admin_b = (Boolean)request.getAttribute("admin_button");
53 51 boolean admin_button = (admin_b == null ? false : admin_b.booleanValue());
54 52 ItemCounter ic = new ItemCounter(UIUtil.obtainContext(request));
55 53 %>
56 54  
57 55 <%!
58   - void showCommunity(Community c, JspWriter out, HttpServletRequest request, ItemCounter ic,
59   - Map collectionMap, Map subcommunityMap) throws ItemCountException, IOException, SQLException
  56 + void showCommunity(Community c, JspWriter out, HttpServletRequest request, ItemCounter ic)
  57 + throws ItemCountException, IOException, SQLException
60 58 {
61 59 boolean showLogos = ConfigurationManager.getBooleanProperty("jspui.community-list.logos", true);
62 60 out.println( "<li class=\"media well\">" );
... ... @@ -69,8 +67,8 @@
69 67 }
70 68  
71 69 //FR: Change - pushed up the cols and comms
72   - Collection[] cols = (Collection[]) collectionMap.get(c.getID());
73   - Community[] comms = (Community[]) subcommunityMap.get(c.getID());
  70 + Collection[] cols = c.getCollections();
  71 + Community[] comms = c.getSubcommunities();
74 72  
75 73 if (cols != null && cols.length > 0 || (comms!= null && comms.length > 0))
76 74 {
... ... @@ -144,7 +142,7 @@
144 142 //out.println("<ul class=\"media-list\">");
145 143 for (int k = 0; k < comms.length; k++)
146 144 {
147   - showCommunity(comms[k], out, request, ic, collectionMap, subcommunityMap);
  145 + showCommunity(comms[k], out, request, ic);
148 146 }
149 147 out.println("</ul>");
150 148 }
... ... @@ -187,7 +185,7 @@
187 185 communities.add((Community) HandleManager.resolveToObject(context,"123456789/1"));
188 186 communities.add((Community) HandleManager.resolveToObject(context,"123456789/15"));
189 187 for (Community community : communities) {
190   - showCommunity(community, out, request, ic, collectionMap, subcommunityMap);
  188 + showCommunity(community, out, request, ic);
191 189 }
192 190 %>
193 191 </ul>
... ...