adding migration for the negative reputation feature

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

diff --git a/forum/forms/admin.py b/forum/forms/admin.py
index 00dc3369106e524b3f3d211e3aa06990a67cc0bf..1ff2e8549d9b145a7e3bdd5e2b495464d144f111 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 _
 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 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):
 
 class IPListField(forms.CharField):
     def clean(self, value):


@@ -56,9 +58,8 @@ class UrlFieldWidget(forms.TextInput):
 
         return """
                 <input class="url_field" type="text" name="%(name)s" value="%(value)s" />
 
         return """
                 <input class="url_field" type="text" name="%(name)s" value="%(value)s" />

-                <a class="url_field_anchor" target="_blank" href="%(app_url)s%(script_alias)s"></a>
-            """  % {'name': name, 'value': value, 'app_url': settings.APP_URL,
-                    'script_alias': settings.FORUM_SCRIPT_ALIAS}
+                <a class="url_field_anchor" target="_blank" href="%(app_url)s"></a>
+            """  % {'name': name, 'value': value, 'app_url': settings.APP_URL}

 
 
 class PageForm(forms.Form):
 
 
 class PageForm(forms.Form):


@@ -90,16 +91,17 @@ class PageForm(forms.Form):
 
     comments = forms.BooleanField(label=_("Allow comments"), initial=False, required=False)
 
 
     comments = forms.BooleanField(label=_("Allow comments"), initial=False, required=False)
 

-TEXT_IN_CHOICES = (
-('title', _('Title')),
-('body', _('Body')),
-('both', _('Title and Body'))
-)
+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 NodeManFilterForm(forms.Form):
-    node_type = forms.CharField(widget=forms.HiddenInput, initial='all')
-    state_type = forms.CharField(widget=forms.HiddenInput, initial='any')
-    text = forms.CharField(required=False, widget=forms.TextInput(attrs={'size': 40}))
-    text_in = forms.ChoiceField(widget=forms.RadioSelect, choices=TEXT_IN_CHOICES, initial='title')

 
 

-    
\ No newline at end of file
+