X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fforms.py;h=fc7d9497e64410fcbea3c9db8c457c047cc7c870;hb=750fdb5d8bb8ab99da479ffa27b33e624a080711;hp=7a222e2324daaa2087b8a3efa91cdfaf621d3d5a;hpb=0cc5c005cc3e24e3859fe00edfa01f560025a7ee;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/influences/forms.py b/influences/forms.py index 7a222e2..fc7d949 100644 --- a/influences/forms.py +++ b/influences/forms.py @@ -1,3 +1,5 @@ +from django.forms.fields import CharField +from django.forms.widgets import Textarea from threadedcomments.forms import ThreadedCommentForm from xerxes.tools.forms import ContextModelForm from models import Influence, Character @@ -10,6 +12,9 @@ from models import Influence, Character # didn't get this to work yet. # class InfluenceCommentForm(ThreadedCommentForm): + # Force the textare to 80 columns. This is really a hack, we should + # rather create a template tag to do this at the template level. + comment = CharField(widget=Textarea(attrs={'cols' : 80})) def __init__(self, *args, **kwargs): super(InfluenceCommentForm, self).__init__(*args, **kwargs) @@ -17,22 +22,29 @@ class InfluenceCommentForm(ThreadedCommentForm): exclude = ('markup', ) class AdminInfluenceCommentForm(ThreadedCommentForm): + comment = CharField(widget=Textarea(attrs={'cols' : 80})) def __init__(self, *args, **kwargs): super(AdminInfluenceCommentForm, self).__init__(*args, **kwargs) class Meta(ThreadedCommentForm.Meta): fields = ThreadedCommentForm.Meta.fields + ('is_public',) + exclude = ('markup', ) class AdminPrivateInfluenceCommentForm(ThreadedCommentForm): + comment = CharField(widget=Textarea(attrs={'cols' : 80})) def __init__(self, *args, **kwargs): super(AdminPrivateInfluenceCommentForm, self).__init__(*args, **kwargs) self.instance.is_public = False + class Meta(ThreadedCommentForm.Meta): + exclude = ('markup', ) + def get_influence_comment_form(is_staff, reply_to): """ Gets the form class that a user can use to reply to the given comment. reply_to can be None, in which case the form class for a new comment is returned. """ - allow_markup = allow_private = is_staff + allow_markup = False + allow_private = is_staff if reply_to: allow_public = reply_to.is_public else: @@ -43,9 +55,9 @@ def _get_influence_comment_form(allow_markup, allow_public, allow_private): """ Internal wrapper that selects the right form class depending on the given options. Should not be called directly, call get_influence_comment_form instead. """ - if allow_markup and allow_public and allow_private: + if not allow_markup and allow_public and allow_private: return AdminInfluenceCommentForm - elif allow_markup and not allow_public and allow_private: + elif not allow_markup and not allow_public and allow_private: return AdminPrivateInfluenceCommentForm elif not allow_markup and allow_public and not allow_private: return InfluenceCommentForm @@ -55,10 +67,10 @@ def _get_influence_comment_form(allow_markup, allow_public, allow_private): class InfluenceForm(ContextModelForm): class Meta: model = Influence - fields = ('character', 'contact', 'summary', 'description') + fields = ('initiator', 'summary', 'other_characters', 'other_contacts', 'description') class CharacterForm(ContextModelForm): class Meta: model = Character - fields = ('name') + fields = ('name', 'type')