From 638f58661c74dae7fbdb411d088c6466778b01ac Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 1 Jun 2007 20:54:07 +0000 Subject: [PATCH] Monotone-Parent: bfa1eaa1a465a26614ff646159f8de7c177bc878 Monotone-Revision: 7d51192a79be7bb49af7def9e40586067798f33c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-01T20:54:07 Monotone-Branch: ca.inverse.sogo --- UI/MailerUI/UIxMailUserRightsEditor.m | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/UI/MailerUI/UIxMailUserRightsEditor.m b/UI/MailerUI/UIxMailUserRightsEditor.m index 2478b5c5a..08942a3ef 100644 --- a/UI/MailerUI/UIxMailUserRightsEditor.m +++ b/UI/MailerUI/UIxMailUserRightsEditor.m @@ -123,27 +123,27 @@ - (void) setUserCanRemoveFolder: (BOOL) userCanRemoveFolder { if (userCanRemoveFolder) - [self appendRight: SOGoRole_ObjectEraser]; + [self appendRight: SOGoRole_FolderEraser]; else - [self removeRight: SOGoRole_ObjectEraser]; + [self removeRight: SOGoRole_FolderEraser]; } - (BOOL) userCanRemoveFolder { - return [userRights containsObject: SOGoRole_ObjectEraser]; + return [userRights containsObject: SOGoRole_FolderEraser]; } - (void) setUserCanEraseMails: (BOOL) userCanEraseMails { if (userCanEraseMails) - [self appendRight: SOGoMailRole_MessageEraser]; + [self appendRight: SOGoRole_ObjectEraser]; else - [self removeRight: SOGoMailRole_MessageEraser]; + [self removeRight: SOGoRole_ObjectEraser]; } - (BOOL) userCanEraseMails { - return [userRights containsObject: SOGoMailRole_MessageEraser]; + return [userRights containsObject: SOGoRole_ObjectEraser]; } - (void) setUserCanExpungeFolder: (BOOL) userCanExpungeFolder @@ -213,16 +213,16 @@ else [self removeRight: SOGoRole_FolderCreator]; + if ([[request formValueForKey: SOGoRole_FolderEraser] length] > 0) + [self appendRight: SOGoRole_FolderEraser]; + else + [self removeRight: SOGoRole_FolderEraser]; + if ([[request formValueForKey: SOGoRole_ObjectEraser] length] > 0) [self appendRight: SOGoRole_ObjectEraser]; else [self removeRight: SOGoRole_ObjectEraser]; - if ([[request formValueForKey: SOGoMailRole_MessageEraser] length] > 0) - [self appendRight: SOGoMailRole_MessageEraser]; - else - [self removeRight: SOGoMailRole_MessageEraser]; - if ([[request formValueForKey: SOGoMailRole_Expunger] length] > 0) [self appendRight: SOGoMailRole_Expunger]; else