feat(web): support desktop notifications, add global inbox polling
Fixes #1234, fixes #3382, fixes #4295pull/287/head
parent
f6ce265e7b
commit
87cf5b473f
|
@ -361,13 +361,14 @@
|
|||
NSDictionary *urlParams, *sortingAttributes;
|
||||
SOGoUser *activeUser;
|
||||
SOGoUserSettings *us;
|
||||
BOOL asc;
|
||||
BOOL asc, dry;
|
||||
|
||||
request = [context request];
|
||||
urlParams = [[request contentAsString] objectFromJSONString];
|
||||
sortingAttributes = [urlParams objectForKey: @"sortingAttributes"];
|
||||
sort = [[sortingAttributes objectForKey: @"sort"] uppercaseString];
|
||||
asc = [[sortingAttributes objectForKey: @"asc"] boolValue];
|
||||
dry = [[sortingAttributes objectForKey: @"dry"] boolValue];
|
||||
|
||||
activeUser = [context activeUser];
|
||||
module = @"Mail";
|
||||
|
@ -378,13 +379,13 @@
|
|||
{
|
||||
if ([sort isEqualToString: [self defaultSortKey]] && !asc)
|
||||
{
|
||||
if (moduleSettings)
|
||||
if (moduleSettings && !dry)
|
||||
{
|
||||
[moduleSettings removeObjectForKey: @"SortingState"];
|
||||
[us synchronize];
|
||||
}
|
||||
}
|
||||
else
|
||||
else if (!dry)
|
||||
{
|
||||
// Save the sorting state in the user settings
|
||||
if (!moduleSettings)
|
||||
|
@ -454,6 +455,7 @@
|
|||
searchString = [NSString stringWithFormat: @"(%@ doesContain: '%@')", searchBy, searchInput];
|
||||
|
||||
searchQualifier = [EOQualifier qualifierWithQualifierFormat: searchString];
|
||||
if (searchQualifier)
|
||||
[searchArray addObject: searchQualifier];
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue