X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fforms.py;h=db825cc018362760833c0c2e74a44a11c582e8e4;hb=dad2574dc3f0cc1d114a85ac44ef440b5baeeaa8;hp=7db751735048eb1affbf7ad7608b4a41606b9ffc;hpb=164fbd42481c6be433170df9f4977a160a8a32bf;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/forms.py b/influences/forms.py
index 7db7517..db825cc 100644
--- a/influences/forms.py
+++ b/influences/forms.py
@@ -1,7 +1,9 @@
-from django.forms.fields import CharField
+from django.forms.fields import CharField, BooleanField
 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
 
 #
@@ -23,6 +25,7 @@ class InfluenceCommentForm(ThreadedCommentForm):
 
 class AdminInfluenceCommentForm(ThreadedCommentForm):
     comment = CharField(widget=Textarea(attrs={'cols' : 80}))
+    is_public = BooleanField(required=False, initial=False)
     def __init__(self, *args, **kwargs):
         super(AdminInfluenceCommentForm, self).__init__(*args, **kwargs)
 
@@ -65,12 +68,17 @@ def _get_influence_comment_form(allow_markup, allow_public, allow_private):
         raise Exception("Unsupported configuration")
 
 class InfluenceForm(ContextModelForm):
+    # Manually define this field so we can select the DropDownMultiple
+    # widget. However, we leave the queryset empty, which characters can
+    # be selected depends on the logged in user and should be set by
+    # setting the choices property in the view.
+    other_characters = ModelMultipleChoiceField(queryset=Character.objects.none(), 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')