github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-11-15 09:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed #96

Browse Source 
Querysets used to populate form fields are more filtered (ie. the default admin is ignored, as the current logged in user).

see #92

More protection against errors that can happen when defining new permissions.
This commit is contained in:
tonio
2010-11-27 17:49:55 +01:00
parent 0973e0f260
commit 5d425c8cbe
10 changed files with 86 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/forms.py
+8 -13
View File
@@ -55,27 +55,22 @@ class AliasForm(forms.ModelForm):
model = Alias
fields = ('address', 'mboxes', 'enabled')
class PermissionForm(forms.Form):
domain = forms.ModelChoiceField(queryset=Domain.objects.all(), label=_("Domain"),
required=True,
help_text=_("Select a domain in the list"))
user = forms.ChoiceField(label=_("User"), required=True,
help_text=_("Select a user in the list"))
role = forms.ChoiceField(label=_("Role"), required=True,
choices=(("SuperAdmins", _("Super administrator")),
("DomainAdmins", _("Domain administrator"))),
help_text=_("Select the role you want this user to have"))
class SuperAdminForm(forms.Form):
user = forms.ModelChoiceField(queryset=User.objects.all(),
label=_("User"), required=True,
user = forms.ModelChoiceField([], label=_("User"), required=True,
empty_label=_("Select a user"),
help_text=_("Select a user in the list"))
def __init__(self, user, *args, **kwargs):
super(SuperAdminForm, self).__init__(*args, **kwargs)
self.fields["user"].queryset = User.objects.exclude(pk__in=[1, user.id])
class DomainAdminForm(forms.Form):
domain = forms.ModelChoiceField(queryset=Domain.objects.all(), label=_("Domain"),
required=True,
empty_label=_("Select a domain"),
help_text=_("Select a domain in the list"))
user = forms.ChoiceField(label=_("User"), required=True,
choices=[("", _("Empty"))],
help_text=_("Select a user in the list"))
class SuperAdminsTable(tables.Table):