From 674f434849641e51cd06a2b2e072f8c1244100b2 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 27 May 2011 08:39:06 +0000
Subject: [PATCH] =?UTF-8?q?Die=20Liste=20der=20Ehemaligen=20enth=C3=A4lt?=
 =?UTF-8?q?=20jetzt=20auch=20die=20ehemalig=20assozierten=20Mitglieder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@942 8810af33-2d31-482b-a856-94f89814c4df
---
 .../contenttypes/ui/SciOrganizationBasePanel.java    | 12 +++++++++++-
 .../cms/contenttypes/ui/SciOrganizationPanel.java    |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

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<String> getFiltersForFormerAssociatedMembers() {
+        List<String> filters;
+        filters = new LinkedList<String>();
+
+        filters.add("link.status = 'associatedFormer'");        
+
+        return filters;
+    }
 
     protected List<String> getFiltersForFormerMembers() {
         List<String> filters;
         filters = new LinkedList<String>();
 
-        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();