scratchfoundation/s2forums
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adds tracker feature #103

Browse source
This commit is contained in:
Nathan Dinsmore 2012-12-05 21:24:42 -05:00
parent 2692427389
commit 5178e3a56a
6 changed files with 67 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
djangobb_forum/forms.py
View file

@ -12,7 +12,7 @@ from django.utils.translation import ugettext_lazy as _
from djangobb_forum.models import Topic, Post, Profile, Reputation, Report, \
Attachment, Poll, PollChoice
from djangobb_forum import settings as forum_settings
from djangobb_forum.util import smiles, convert_text_to_html, set_language
from djangobb_forum.util import smiles, convert_text_to_html, set_language, UnapprovedImageError
SORT_USER_BY_CHOICES = (
@ -44,7 +44,6 @@ SEARCH_IN_CHOICES = (
('topic', _(u'Topic subject only')),
)
class AddPostForm(forms.ModelForm):
FORM_NAME = "AddPostForm" # used in view and template submit button
@ -90,6 +89,11 @@ class AddPostForm(forms.ModelForm):
if not body.strip():
self._errors['body'] = self.error_class([errmsg])
del cleaned_data['body']
try:
convert_text_to_html(body, self.user.forum_profile.markup)
except UnapprovedImageError as e:
self._errors['body'] = self.error_class([e.user_error()])
del cleaned_data['body']
return cleaned_data
def clean_attachment(self):
@ -148,6 +152,17 @@ class EditPostForm(forms.ModelForm):
self.fields['name'].initial = self.topic
self.fields['body'].widget = forms.Textarea(attrs={'class':'markup'})
def clean(self):
cleaned_data = self.cleaned_data
body = cleaned_data.get('body')
if body:
try:
convert_text_to_html(body, self.instance.markup)
except UnapprovedImageError as e:
self._errors['body'] = self.error_class([e.user_error()])
del cleaned_data['body']
return cleaned_data
def save(self, commit=True):
post = super(EditPostForm, self).save(commit=False)
post.updated = datetime.now()