mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-17 05:41:25 +02:00
+4
-5
@@ -290,9 +290,6 @@ class AccountFormGeneralPwd(AccountFormGeneral):
|
||||
return user
|
||||
|
||||
class AccountFormMail(forms.Form, DynamicForm):
|
||||
# FIXME
|
||||
# * Renommage de boite ?
|
||||
|
||||
email = forms.EmailField(label=ugettext_lazy("E-mail"), required=False)
|
||||
quota = forms.IntegerField(label=ugettext_lazy("Quota"), required=False)
|
||||
aliases = forms.EmailField(
|
||||
@@ -309,11 +306,13 @@ class AccountFormMail(forms.Form, DynamicForm):
|
||||
if not hasattr(self, "mb") or self.mb is None:
|
||||
return
|
||||
self.fields["email"].required = True
|
||||
for pos, alias in enumerate(self.mb.alias_set.all()):
|
||||
cpt = 1
|
||||
for alias in self.mb.alias_set.all():
|
||||
if len(alias.get_recipients()) >= 2:
|
||||
continue
|
||||
name = "aliases_%d" % (pos + 1)
|
||||
name = "aliases_%d" % cpt
|
||||
self._create_field(forms.EmailField, name, alias.full_address)
|
||||
cpt += 1
|
||||
self.fields["email"].initial = self.mb.full_address
|
||||
self.fields["quota"].initial = self.mb.quota
|
||||
if len(args) and isinstance(args[0], QueryDict):
|
||||
|
||||
@@ -1551,7 +1551,7 @@ msgstr "Répondre à tous"
|
||||
#: extensions/webmail/templatetags/webextras.py:29
|
||||
#: userprefs/templatetags/uprefs_extras.py:25
|
||||
msgid "Forward"
|
||||
msgstr "Transférer"
|
||||
msgstr "Transfert"
|
||||
|
||||
#: extensions/webmail/templatetags/webextras.py:35
|
||||
msgid "Display options"
|
||||
|
||||
+3
-3
@@ -23,13 +23,13 @@ DATABASES = {
|
||||
"PORT" : ""
|
||||
},
|
||||
# "pfxadmin" : {
|
||||
# "ENGINE" : "",
|
||||
# "ENGINE" : "django.db.backends.",
|
||||
# "NAME" : "",
|
||||
# "USER" : "",
|
||||
# "PASSWORD" : ""
|
||||
# },
|
||||
# "amavis": {
|
||||
# "ENGINE" : "",
|
||||
# "ENGINE" : "django.db.backends.",
|
||||
# "HOST" : "",
|
||||
# "NAME" : "",
|
||||
# "USER" : "",
|
||||
@@ -116,6 +116,7 @@ INSTALLED_APPS = (
|
||||
'modoboa.userprefs',
|
||||
|
||||
# Modoboa extensions here.
|
||||
'modoboa.extensions.limits',
|
||||
'modoboa.extensions.postfix_autoreply',
|
||||
'modoboa.extensions.webmail',
|
||||
'modoboa.extensions.stats',
|
||||
@@ -132,7 +133,6 @@ AUTHENTICATION_BACKENDS = (
|
||||
)
|
||||
|
||||
#SESSION_COOKIE_AGE = 300
|
||||
#CACHE_BACKEND = 'file://'
|
||||
|
||||
#
|
||||
# External LDAP authentication (optional)
|
||||
|
||||
Reference in New Issue
Block a user