slight updates to fix #58 #59

tcpd · Apr 18, 2019 · 6ef12ed · 6ef12ed
1 parent df3e61c
commit 6ef12ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/WebContent/table.jsp b/WebContent/table.jsp
@@ -344,8 +344,8 @@ pageEncoding="UTF-8"
 
                 <td class="cell-table table-cell-merge"><%=mergeCheckboxHTML%></td>
 
-                <!-- need word-wrap: break-all to break very long names -->
-				<td style="min-width:300px;word-wrap:break-all" class="cell-table table-cell-name"><a href="<%=href%>" title="<%=hoverText%>" target="_blank"><%=Util.escapeHTML(row.get(Config.MERGE_FIELD).toUpperCase())%></a></td>
+                <!-- need word-break: break-all to break very long names -->
+				<td style="min-width:300px;word-break:break-all" class="cell-table table-cell-name"><a href="<%=href%>" title="<%=hoverText%>" target="_blank"><%=Util.escapeHTML(row.get(Config.MERGE_FIELD).toUpperCase())%></a></td>
 				<%-- <td class="cell-table table-cell-constituency"><a href="<%=pc_href%>" title="<%=pcInfo%>" target="_blank"><%=Util.escapeHTML(row.get("Constituency_Name").toUpperCase())%></a></td> --%>
 
                 <%

diff --git a/src/in/edu/ashoka/surf/MergeManager.java b/src/in/edu/ashoka/surf/MergeManager.java
@@ -475,7 +475,7 @@ private List<List<List<Row>>> applyFilter (Filter filter, GroupViewControl gvc,
                     }
                     case GROUPS_WITH_ONE_OR_MORE_ROWS_AND_TWO_OR_MORE_IDS: {
                         Collection<Row> rowsMatchingFilter = group.stream().filter(filter::passes).collect(Collectors.toList());
-                        Set<String> idsInGroup = group.stream().filter(filter::passes).map(r -> r.get(Config.ID_FIELD)).collect(Collectors.toSet());
+                        Set<String> idsInGroup = group.stream().map(r -> r.get(Config.ID_FIELD)).collect(Collectors.toSet());
                         groupWillBeShown = (rowsMatchingFilter.size() > 0 && idsInGroup.size() >= 2);
                         break;
                     }