X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/416900811aee814428b3516f048cd2bf245179f7..60cf509da831a2e81e2631ffc1150f81ed96fe4c:/forum/forms/qanda.py?ds=sidebyside diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py index a3c093c..39f9ca7 100644 --- a/forum/forms/qanda.py +++ b/forum/forms/qanda.py @@ -136,7 +136,7 @@ class SummaryField(forms.CharField): class FeedbackForm(forms.Form): name = forms.CharField(label=_('Your name:'), required=False) - email = forms.EmailField(label=_('Email (not shared with anyone):'), required=False) + email = forms.EmailField(label=_('Email (not shared with anyone):'), required=True) message = forms.CharField(label=_('Your message:'), max_length=800,widget=forms.Textarea(attrs={'cols':60})) next = NextUrlField() @@ -182,8 +182,8 @@ class RevisionForm(forms.Form): def __init__(self, post, *args, **kwargs): super(RevisionForm, self).__init__(*args, **kwargs) - revisions = post.revisions.all().values_list( - 'revision', 'author__username', 'revised_at', 'summary') + revisions = post.revisions.all().values_list('revision', 'author__username', 'revised_at', 'summary').order_by('-revised_at') + 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]))