LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix SOGoLoginModule when set to "Last used"

pull/225/head
Francis Lachapelle 2016-10-31 15:12:47 -04:00
parent 067934026b
commit 0b99dbfc99
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/PreferencesUI/UIxJSONPreferences.m
View File

@ -356,10 +356,6 @@ static SoProduct *preferencesProduct = nil;
[values setObject: vacation forKey: @"Vacation"];
}
// Don't expose SOGoRememberLastModule;
// User can edit SOGoLoginModule but SOGoRememberLastModule is managed internally.
[values removeObjectForKey: @"SOGoRememberLastModule"];
return [self responseWithStatus: 200 andJSONRepresentation: values];
}

10
UI/PreferencesUI/UIxPreferences.m
View File

@ -2183,6 +2183,7 @@ static NSArray *reminderValues = nil;
NSArray *allKeys, *accounts;
NSDictionary *newLabels;
NSString *name;
id loginModule;
int i;
@ -2190,7 +2191,14 @@ static NSArray *reminderValues = nil;
v = [[v mutableCopy] autorelease];
if ([[v objectForKey: @"SOGoLoginModule"] isEqualToString: @"Last"])
[v setObject: [NSNumber numberWithBool: YES] forKey: @"SOGoRememberLastModule"];
{
[v setObject: [NSNumber numberWithBool: YES] forKey: @"SOGoRememberLastModule"];
loginModule = [[[user userDefaults] source] objectForKey: @"SOGoLoginModule"];
if (loginModule)
[v setObject: loginModule forKey: @"SOGoLoginModule"];
else
[v removeObjectForKey: @"SOGoLoginModule"];
}
else
[v setObject: [NSNumber numberWithBool: NO] forKey: @"SOGoRememberLastModule"];

3
UI/WebServerResources/js/Preferences/Preferences.service.js
View File

@ -25,6 +25,9 @@
data.SOGoMailLabelsColors = labels;
if (data.SOGoRememberLastModule)
data.SOGoLoginModule = "Last";
// Mail editor autosave is a number of minutes or 0 if disabled
data.SOGoMailAutoSave = parseInt(data.SOGoMailAutoSave) || 0;