From 67dff673f5606ae10693289c2f3f6c60c6239581 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 3 Dec 2014 11:38:46 +0100 Subject: [PATCH] Rename setting. --- modoboa/core/app_settings.py | 15 ++------------- modoboa/extensions/admin/__init__.py | 2 +- modoboa/extensions/admin/app_settings.py | 9 +++++++++ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py index d8c65a49d..f65eb421b 100644 --- a/modoboa/core/app_settings.py +++ b/modoboa/core/app_settings.py @@ -188,8 +188,7 @@ class GeneralParametersForm(parameters.AdminParametersForm): "Members of those LDAP Posix groups will be created as domain " "administrators. Use ';' characters to separate groups." ), - required=False, - widget=forms.TextInput(attrs={"class": "form-control"}) + required=False ) ldap_groups_search_base = forms.CharField( @@ -198,17 +197,7 @@ class GeneralParametersForm(parameters.AdminParametersForm): help_text=ugettext_lazy( "The distinguished name of the search base used to find groups" ), - required=False, - widget=forms.TextInput(attrs={"class": "form-control"}) - ) - - ldap_create_domain_mailbox = YesNoField( - label=ugettext_lazy("Domain/mailbox creation"), - initial="yes", - help_text=ugettext_lazy( - "Automatically create a domain and a mailbox when a new user " - "is created just after the first successful authentication." - ) + required=False ) sep3 = SeparatorField(label=ugettext_lazy("Miscellaneous")) diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py index f71dca1a2..050d3f6f2 100644 --- a/modoboa/extensions/admin/__init__.py +++ b/modoboa/extensions/admin/__init__.py @@ -205,7 +205,7 @@ def account_auto_created(user): from modoboa.extensions.admin.lib import check_if_domain_exists from modoboa.lib.permissions import grant_access_to_object - if parameters.get_admin("LDAP_CREATE_DOMAIN_MAILBOX", app="core") == "no": + if parameters.get_admin("AUTO_CREATE_DOMAIN_AND_MAILBOX") == "no": return localpart, domname = split_mailbox(user.username) if user.group != 'SimpleUsers' and domname is None: diff --git a/modoboa/extensions/admin/app_settings.py b/modoboa/extensions/admin/app_settings.py index 268b8d250..3f27d114f 100644 --- a/modoboa/extensions/admin/app_settings.py +++ b/modoboa/extensions/admin/app_settings.py @@ -45,6 +45,15 @@ class AdminParametersForm(parameters.AdminParametersForm): "When a mailbox is removed, also remove the associated account") ) + auto_create_domain_and_mailbox = YesNoField( + label=ugettext_lazy("Automatic domain/mailbox creation"), + initial="yes", + help_text=ugettext_lazy( + "Create a domain and a mailbox when an account is automatically " + "created." + ) + ) + # Visibility rules visibility_rules = { "mailboxes_owner": "handle_mailboxes=yes",