Add ability to customize user display

pinax/messages/forms.py

@@ -6,9 +6,23 @@
 from .models import Message
 
 
-class NewMessageForm(forms.ModelForm):
+class UserModelChoiceField(forms.ModelChoiceField):
+
+    def label_from_instance(self, obj):
+        return hookset.display_name(obj)
+
+
+class UserModelMultipleChoiceField(forms.ModelMultipleChoiceField):
+
+    def label_from_instance(self, obj):
+        return hookset.display_name(obj)
+
+
+class NewMessageForm(forms.Form):
+
     subject = forms.CharField()
-    to_user = forms.ModelChoiceField(queryset=get_user_model().objects.none)
+    to_user = UserModelChoiceField(queryset=get_user_model().objects.none)
+    content = forms.CharField(widget=forms.Textarea)
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop("user")
@@ -31,7 +45,8 @@ class Meta:
 
 class NewMessageFormMultiple(forms.ModelForm):
     subject = forms.CharField()
-    to_user = forms.ModelMultipleChoiceField(get_user_model().objects.none)
+    to_user = UserModelMultipleChoiceField(get_user_model().objects.none)
+    content = forms.CharField(widget=forms.Textarea)
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop("user")

pinax/messages/hooks.py

@@ -3,6 +3,9 @@
 
 class DefaultHookSet(object):
 
+    def display_name(self, user):
+        return str(user)
+
     def get_user_choices(self, user):
         return get_user_model().objects.exclude(id=user.id)