diff options
| author | Thomas Bruederli <bruederli@kolabsys.com> | 2014-08-23 14:12:13 -0400 |
|---|---|---|
| committer | Thomas Bruederli <bruederli@kolabsys.com> | 2014-08-23 14:12:13 -0400 |
| commit | 62df71a225fc2dbc2351a9e8ac211546c6af4ac8 (patch) | |
| tree | 2f2993d2122c6053c8e6bc39f3da9194463cf610 /wallace | |
| parent | d9f0b4336e151e5cb29b911f1e823289c3dc78bf (diff) | |
| download | pykolab-62df71a225fc2dbc2351a9e8ac211546c6af4ac8.tar.gz | |
Store confidential iTip invitation events in a dedicated folder - if exists (#3639)
Diffstat (limited to 'wallace')
| -rw-r--r-- | wallace/module_invitationpolicy.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/wallace/module_invitationpolicy.py b/wallace/module_invitationpolicy.py index 5c187c5..753547c 100644 --- a/wallace/module_invitationpolicy.py +++ b/wallace/module_invitationpolicy.py @@ -728,9 +728,14 @@ def list_user_folders(user_rec, type): or metadata[folder].has_key('/private' + FOLDER_TYPE_ANNOTATION) and metadata[folder]['/private' + FOLDER_TYPE_ANNOTATION].startswith(type)): result.append(folder) - # store default folder folder in user record - if metadata[folder].has_key('/private' + FOLDER_TYPE_ANNOTATION) and metadata[folder]['/private' + FOLDER_TYPE_ANNOTATION].endswith('.default'): - user_rec['_default_folder'] = folder + if metadata[folder].has_key('/private' + FOLDER_TYPE_ANNOTATION): + # store default folder in user record + if metadata[folder]['/private' + FOLDER_TYPE_ANNOTATION].endswith('.default'): + user_rec['_default_folder'] = folder + + # store confidential folder in user record + if metadata[folder]['/private' + FOLDER_TYPE_ANNOTATION].endswith('.confidential') and not user_rec.has_key('_confidential_folder'): + user_rec['_confidential_folder'] = folder # cache with user record user_rec['_imap_folders'] = result @@ -908,6 +913,9 @@ def store_object(object, user_rec, targetfolder=None): targetfolder = list_user_folders(user_rec, object.type)[0] if user_rec.has_key('_default_folder'): targetfolder = user_rec['_default_folder'] + # use *.confidential folder for invitations classified as confidential + if object.get_classification() == kolabformat.ClassConfidential and user_rec.has_key('_confidential_folder'): + targetfolder = user_rec['_confidential_folder'] if not targetfolder: log.error(_("Failed to save %s: no target folder found for user %r") % (object.type, user_rec['mail'])) |