Fix for bug #2006.

SoObjects/Contacts/SOGoContactGCSFolder.m

@@ -191,6 +191,10 @@ static NSArray *folderListingFields = nil;
         qs = [NSString stringWithFormat:
                          @"(c_categories isCaseInsensitiveLike: '%%%@%%')",
                        filter];
+      else if ([criteria isEqualToString: @"organization"])
+        qs = [NSString stringWithFormat:
+                         @"(c_o isCaseInsensitiveLike: '%%%@%%')",
+                       filter];
       else
         qs = @"(1 == 0)";
 

UI/Contacts/UIxContactsFilterPanel.m

@@ -32,15 +32,6 @@
 
 @implementation UIxContactsFilterPanel
 
-static NSMutableArray *filters = nil;
-
-+ (void) initialize
-{
-#warning how useful is this?
-  if (!filters)
-    filters = [[NSMutableArray alloc] initWithCapacity:4];
-}
-
 - (id) init
 {
   if ((self = [super init]))
@@ -87,13 +78,6 @@ static NSMutableArray *filters = nil;
   return searchCriteria;
 }
 
-/* filters */
-
-- (NSArray *) filters
-{
-  return filters;
-}
-
 /* qualifiers */
 
 - (NSString *) filterLabel

UI/Contacts/UIxContactsListActions.m

@@ -1,8 +1,8 @@
 /*
-  Copyright (C) 2006-2011 Inverse inc.
+  Copyright (C) 2006-2012 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOGo.
 
   SOGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the

UI/Templates/ContactsUI/UIxContactsFilterPanel.wox

@@ -10,6 +10,7 @@
         <li id="name_or_address"><var:string
 	    label:value="Name or Email"/></li>
         <li id="category"><var:string label:value="Category"/></li>
+        <li id="organization"><var:string label:value="Organization"/></li>
       </ul>
     </div>
 

UI/WebServerResources/ContactsUI.js

@@ -1227,7 +1227,7 @@ getMenus = function() {
                                      "-", onMenuDeleteContact, "-",
                                      "moveContactMenu", "copyContactMenu", 
                                      onMenuExportContact, onMenuRawContact);
-    menus["searchMenu"] = new Array(setSearchCriteria, setSearchCriteria);
+    menus["searchMenu"] = new Array(setSearchCriteria, setSearchCriteria, setSearchCriteria);
    
     var contactFoldersMenu = $("contactFoldersMenu");
     if (contactFoldersMenu)