From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Tue, 3 Feb 2009 22:14:34 +0000 (+0100)
Subject: Limit the choices for the other_characters field.
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=04c28714ac627931739f7b4f0048cdf920f9830b;p=matthijs%2Fprojects%2Fxerxes.git

Limit the choices for the other_characters field.
---

diff --git a/influences/forms.py b/influences/forms.py
index 56e31ca..e1a6db3 100644
--- a/influences/forms.py
+++ b/influences/forms.py
@@ -67,7 +67,11 @@ 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)
+    # 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 = ('initiator', 'summary', 'other_characters', 'other_contacts', 'description')
diff --git a/influences/views.py b/influences/views.py
index ed23bb2..334bfc7 100644
--- a/influences/views.py
+++ b/influences/views.py
@@ -14,27 +14,40 @@ from threadedcomments.views import free_comment, _preview
 from xerxes.influences.models import Character
 from xerxes.influences.models import Influence
 from forms import get_influence_comment_form, InfluenceForm, CharacterForm
+from xerxes.tools.misc import make_choices
 
 @login_required
 def add_influence(request, character_id=None):
     initial = {}
     # Get the current user's characters
-    chars = request.user.character_set.all()
+    my_chars = request.user.character_set.all().filter(type__in=['P', 'N'])
+    # Get all chars
+    all_chars = Character.objects.all().filter(type__in=['P', 'N'])
 
     # If a character_id was specified in the url, or there is only one
     # character, preselect it.
     if (character_id):
         initial['initiator'] = character_id
-    elif (chars.count() == 1):
-        initial['initiator'] = chars[0].id
-
+    elif (my_chars.count() == 1):
+        initial['initiator'] = my_chars[0].id
 
     f = InfluenceForm(request=request, initial=initial)
 
     # Only allow characters of the current user. Putting this here also
     # ensures that a form will not validate when any other choice was
     # selected (perhaps through URL crafting).
-    f.fields['initiator']._set_queryset(chars)
+    f.fields['initiator']._set_queryset(my_chars)
+    
+    # List the contacts of each of the current users characters, as well
+    # as all other (non-contact) characters as choices for the
+    # other_characters field.
+    char_choices = [
+        ("Contacts of %s" % c, make_choices(c.contacts.all()))
+        for c in my_chars
+        if c.contacts.all()
+    ]
+    char_choices.append(('All player characters', make_choices(all_chars)))
+    f.fields['other_characters'].choices = char_choices
 
     if (f.is_valid()):
         # The form was submitted, let's save it.