X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fforms.py;h=56e31ca471334d36ed8e446be6ed9536465e48c9;hb=eb845e4ffb2eb95d9f2e4375f921fa52e10e0fb7;hp=b9416f9d590dc5238b1615a4cefa13b70445e623;hpb=2ae4f2443bdf48a26be09b126b7720771bd6d477;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/forms.py b/influences/forms.py
index b9416f9..56e31ca 100644
--- a/influences/forms.py
+++ b/influences/forms.py
@@ -1,5 +1,9 @@
+from django.forms.fields import CharField
+from django.forms.widgets import Textarea
+from django.forms.models import ModelMultipleChoiceField
 from threadedcomments.forms import ThreadedCommentForm
 from xerxes.tools.forms import ContextModelForm
+from xerxes.tools.widgets import DropDownMultiple
 from models import Influence, Character
 
 #
@@ -10,6 +14,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,6 +24,7 @@ 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)
 
@@ -25,6 +33,7 @@ class AdminInfluenceCommentForm(ThreadedCommentForm):
         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
@@ -58,12 +67,13 @@ def _get_influence_comment_form(allow_markup, allow_public, allow_private):
         raise Exception("Unsupported configuration")
 
 class InfluenceForm(ContextModelForm):
+    other_characters = ModelMultipleChoiceField(queryset=Character.objects.all(), widget=DropDownMultiple)
     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')