Branch 'kolab/integration/4.13.0' - incidenceeditor-ng/resourcemodel.cpp

[Sandro Knauß]

 incidenceeditor-ng/resourcemodel.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d43b4919a6bdb5ac38f990e7b699fa5d31a97dfb
Author: Sandro Knauß <knauss at kolabsys.com>
Date:   Wed Aug 20 13:20:05 2014 +0200

    search also inside description and kolabattributes for matching resources

diff --git a/incidenceeditor-ng/resourcemodel.cpp b/incidenceeditor-ng/resourcemodel.cpp
index 0bd9566..59ee4db 100644
--- a/incidenceeditor-ng/resourcemodel.cpp
+++ b/incidenceeditor-ng/resourcemodel.cpp
@@ -39,7 +39,7 @@ ResourceModel::ResourceModel(const QStringList &headers,
     ldapSearchCollections.setFilter(QString::fromLatin1("&(ou=Resources,*)(objectClass=kolabGroupOfUniqueNames)(objectclass=groupofurls)(!(objectclass=nstombstone))(mail=*)"
                                     "(cn=%1)"));
     ldapSearch.setFilter(QString::fromLatin1("&(objectClass=kolabSharedFolder)(kolabFolderType=event)(mail=*)"
-                         "(|(cn=%1)(givenName=%1)(sn=%1))"));
+                                      "(|(cn=%1)(description=%1)(kolabDescAttribute=%1))"));
 
     QStringList attrs = ldapSearchCollections.attributes();
     attrs << QLatin1String("uniqueMember");