From 0979bd13aef99a578fcfac3c52b6c86c0745aae6 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Sat, 17 Nov 2012 17:16:00 -0500
Subject: [PATCH] Fix for bug #2006.

---
 SoObjects/Contacts/SOGoContactGCSFolder.m        |  4 ++++
 UI/Contacts/UIxContactsFilterPanel.m             | 16 ----------------
 UI/Contacts/UIxContactsListActions.m             |  4 ++--
 .../ContactsUI/UIxContactsFilterPanel.wox        |  1 +
 UI/WebServerResources/ContactsUI.js              |  2 +-
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index 6b8b313dd..7b8bfdac4 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/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)";
 
diff --git a/UI/Contacts/UIxContactsFilterPanel.m b/UI/Contacts/UIxContactsFilterPanel.m
index a0f5721bb..75af540ee 100644
--- a/UI/Contacts/UIxContactsFilterPanel.m
+++ b/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
diff --git a/UI/Contacts/UIxContactsListActions.m b/UI/Contacts/UIxContactsListActions.m
index f6941bc0f..1b9ab62f4 100644
--- a/UI/Contacts/UIxContactsListActions.m
+++ b/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
diff --git a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox b/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
index c7e87d2d3..8dca00abe 100644
--- a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
+++ b/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>
 
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 7f9a835e4..49a532b52 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/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)