Several improvements in the node bulk management feature. Improved filters and added...

[osqa.git] / forum / forms / admin.py

diff --git a/forum/forms/admin.py b/forum/forms/admin.py
index 7bf789e75b5cce1d23bdbaa09e9283e1e2be620b..32d710bebc0a1f6d1f43a896a15c2065b9ae712c 100644 (file)
--- a/forum/forms/admin.py
+++ b/forum/forms/admin.py
@@ -1,9 +1,11 @@
 import socket
 from django import forms
 from django.utils.translation import ugettext as _
+from django.contrib.admin.widgets import FilteredSelectMultiple, AdminDateWidget
 from qanda import TitleField, EditorField
 from forum import settings
 from forum.models.node import NodeMetaClass
+from forum.models import User
 
 class IPListField(forms.CharField):
     def clean(self, value):
@@ -103,14 +105,17 @@ class NodeManFilterForm(forms.Form):
     text_in = forms.ChoiceField(required=False, widget=forms.RadioSelect, choices=TEXT_IN_CHOICES, initial='title')
 
 
-NODE_SHOW_CHOICES = (
-('score', _('Score')),
-('added_at', 'Added at'),
-('last_activity_at', 'Last activity at'),
-('last_activity_by', 'Last activity by')
-)
+from forum.forms.auth import SimpleRegistrationForm
+from forum.forms.general import SetPasswordForm
+
+
+class CreateUserForm(SimpleRegistrationForm, SetPasswordForm):
+    validate_email = forms.BooleanField(required=False, label=_('send validation email'))
+
+    def __init__(self, *args, **kwargs):
+        super(CreateUserForm, self).__init__(*args, **kwargs)
+        self.fields.keyOrder = ['username', 'email', 'validate_email', 'password1', 'password2']
+        self.fields['email'].label = _('email address')
 
-class NodeManShowForm(forms.Form):
-    show = forms.MultipleChoiceField(choices=NODE_SHOW_CHOICES, widget=forms.CheckboxSelectMultiple)
 
     
\ No newline at end of file