be able to have user links without ids in the url, wrapped in a setting of the URL...

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

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index 98906400a5d2da211136303f8944899060513203..3e95355a79e46ad9173b47c2a451f236e8d16e68 100644 (file)
--- a/forum/forms/qanda.py
+++ b/forum/forms/qanda.py
@@ -5,8 +5,10 @@ from forum.models import *
 from django.utils.translation import ugettext as _
 from django.contrib.humanize.templatetags.humanize import apnumber
 
 from django.utils.translation import ugettext as _
 from django.contrib.humanize.templatetags.humanize import apnumber
 

+from django.utils.encoding import smart_unicode

 from django.utils.safestring import mark_safe
 from general import NextUrlField, UserNameField, SetPasswordForm
 from django.utils.safestring import mark_safe
 from general import NextUrlField, UserNameField, SetPasswordForm

+

 from forum import settings
 
 from forum.modules import call_all_handlers
 from forum import settings
 
 from forum.modules import call_all_handlers


@@ -17,8 +19,8 @@ class TitleField(forms.CharField):
     def __init__(self, *args, **kwargs):
         super(TitleField, self).__init__(*args, **kwargs)
         self.required = True
     def __init__(self, *args, **kwargs):
         super(TitleField, self).__init__(*args, **kwargs)
         self.required = True

-        self.widget = forms.TextInput(attrs={'size' : 70, 'autocomplete' : 'off'})

         self.max_length = 255
         self.max_length = 255

+        self.widget = forms.TextInput(attrs={'size' : 70, 'autocomplete' : 'off', 'maxlength' : self.max_length})

         self.label  = _('title')
         self.help_text = _('please enter a descriptive title for your question')
         self.initial = ''
         self.label  = _('title')
         self.help_text = _('please enter a descriptive title for your question')
         self.initial = ''


@@ -213,7 +215,7 @@ class RevisionForm(forms.Form):
 
         date_format = '%c'
         self.fields['revision'].choices = [
 
         date_format = '%c'
         self.fields['revision'].choices = [

-            (r[0], u'%s - %s (%s) %s' % (r[0], r[1], r[2].strftime(date_format), r[3]))
+            (r[0], u'%s - %s (%s) %s' % (r[0], smart_unicode(r[1]), r[2].strftime(date_format), r[3]))

             for r in revisions]
 
         self.fields['revision'].initial = post.active_revision.revision
             for r in revisions]
 
         self.fields['revision'].initial = post.active_revision.revision


@@ -296,8 +298,7 @@ class EditUserForm(forms.Form):
 
         if user.date_of_birth is not None:
             self.fields['birthday'].initial = user.date_of_birth
 
         if user.date_of_birth is not None:
             self.fields['birthday'].initial = user.date_of_birth

-        else:
-            self.fields['birthday'].initial = '1990-01-01'
+

         self.fields['about'].initial = user.about
         self.user = user
 
         self.fields['about'].initial = user.about
         self.user = user