Branch 'kolab/integration/4.13.0' - korganizer/calendarview.cpp
Sandro Knauß
knauss at kolabsys.com
Wed Feb 18 10:24:36 CET 2015
korganizer/calendarview.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 15e2d3acac4ad4f65b1c1891b5131d6c600f36bc
Author: Sandro Knauà <knauss at kolabsys.com>
Date: Tue Feb 17 16:49:10 2015 +0100
Allow different identities on the Open/declined Invitation folder.
Till now the search was a little bit unusable, cause it searches for
events, with all identieis having the same status. Create a OR search
instead.
Kolab: #4606
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index c0cc169..9a2cf9b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -364,7 +364,7 @@ void CalendarView::onSearchCollectionsFetched(KJob *job)
void CalendarView::createOrUpdateSearchCollections()
{
- Akonadi::SearchQuery query;
+ Akonadi::SearchQuery query(Akonadi::SearchTerm::RelOr);
foreach (const QString email, mIdentityManager.allEmails()) {
query.addTerm(Akonadi::IncidenceSearchTerm(Akonadi::IncidenceSearchTerm::PartStatus, QString(email+ QString::number(KCalCore::Attendee::NeedsAction))));
}
@@ -391,7 +391,7 @@ void CalendarView::createOrUpdateSearchCollections()
kDebug() << query.toJSON();
}
- query = Akonadi::SearchQuery();
+ query = Akonadi::SearchQuery(Akonadi::SearchTerm::RelOr);
foreach (const QString email, mIdentityManager.allEmails()) {
query.addTerm(Akonadi::IncidenceSearchTerm(Akonadi::IncidenceSearchTerm::PartStatus, QString(email+ QString::number(KCalCore::Attendee::Declined))));
}
More information about the commits
mailing list