diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationBasePanel.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationBasePanel.java index ea5ac164f..6a0e71384 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationBasePanel.java +++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationBasePanel.java @@ -209,12 +209,22 @@ public abstract class SciOrganizationBasePanel return filters; } + + protected List getFiltersForFormerAssociatedMembers() { + List filters; + filters = new LinkedList(); + + filters.add("link.status = 'associatedFormer'"); + + return filters; + } protected List getFiltersForFormerMembers() { List filters; filters = new LinkedList(); - filters.add("link.status = 'former'"); + //filters.add("link.status = 'former'"); + filters.add("lower(link.status) like lower('%former%')"); return filters; } diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPanel.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPanel.java index f46de4ff2..5ccb95012 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPanel.java +++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPanel.java @@ -265,7 +265,7 @@ public class SciOrganizationPanel extends SciOrganizationBasePanel { for (String filter : filters) { orgaMembers.addFilter(filter); } - + SciOrganizationDepartmentsCollection departments; departments = orga.getDepartments();