From faaf1f628c7d16a9d6b02e02829e2465b8beb1f8 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 24 Jun 2014 21:49:24 +0200 Subject: [PATCH] wip: Radicale extension #574 New option to control calendars adminstration. --- modoboa/extensions/radicale/app_settings.py | 6 +++--- .../radicale/management/commands/generate_rights.py | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modoboa/extensions/radicale/app_settings.py b/modoboa/extensions/radicale/app_settings.py index 457870d54..1862781a1 100644 --- a/modoboa/extensions/radicale/app_settings.py +++ b/modoboa/extensions/radicale/app_settings.py @@ -1,7 +1,7 @@ from django.utils.translation import ugettext_lazy from django import forms from modoboa.lib.parameters import AdminParametersForm -from modoboa.lib.formutils import SeparatorField +from modoboa.lib.formutils import SeparatorField, YesNoField class ParametersForm(AdminParametersForm): @@ -16,9 +16,9 @@ class ParametersForm(AdminParametersForm): help_text=ugettext_lazy("Path to file that contains rights definition") ) - allow_calendars_administration = forms.BooleanField( + allow_calendars_administration = YesNoField( label=ugettext_lazy("Allow calendars administration"), - initial=False, + initial="no", help_text=ugettext_lazy( "Allow domain administrators to manage user calendars (read an write)" ) diff --git a/modoboa/extensions/radicale/management/commands/generate_rights.py b/modoboa/extensions/radicale/management/commands/generate_rights.py index 83e3aae57..23f5e0c97 100644 --- a/modoboa/extensions/radicale/management/commands/generate_rights.py +++ b/modoboa/extensions/radicale/management/commands/generate_rights.py @@ -79,8 +79,11 @@ permission = %s # DO NOT EDIT MANUALLY! """ % datetime.datetime.today()) - #self._super_admin_rules() - #self._domain_admin_rules() + allow_calendars_administration = parameters.get_admin( + "ALLOW_CALENDARS_ADMINISTRATION", app="radicale") + if allow_calendars_administration == "yes": + self._super_admin_rules() + self._domain_admin_rules() self._generate_acr( "domain-shared-calendars", r"^(.+)@(.+)$", r"{1}/shared/.+$",