Merge pull request sakaiproject#6 from dennycs/bug/SAK-29161

SAK-29161 now users can see a list of softly deleted sites in Worksite setup
marktriggs · May 4, 2015 · 5b8139e · 5b8139e
2 parents 3b5cb7d + a2fc7f7
commit 5b8139e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/site/impl/DbSiteService.java
@@ -728,7 +728,7 @@ else if (ofType instanceof Set)
 				}
 			}
 			if (criteria != null) fieldCount += 1;
-			if ((type == SelectionType.JOINABLE) || (type == SelectionType.ACCESS) || (type == SelectionType.UPDATE) || (type == SelectionType.MEMBER)) fieldCount++;
+			if ((type == SelectionType.JOINABLE) || (type == SelectionType.ACCESS) || (type == SelectionType.UPDATE) || (type == SelectionType.MEMBER) || (type == SelectionType.DELETED)) fieldCount++;
 			if (propertyCriteria != null) fieldCount += (2 * propertyCriteria.size());
 			Object fields[] = null;
 			if (fieldCount > 0)