# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1294633341 0
# Node ID c7c427411f03dc12f33c92796f9710ecc2ccc4a6
# Parent  4f032a6e21f8fb56323da0f3b219e04f7c50e04a
Fixing #134: put private message text in notification email.

diff -r 4f032a6e21f8 -r c7c427411f03 gpp/messages/admin.py
--- a/gpp/messages/admin.py	Mon Jan 10 03:33:21 2011 +0000
+++ b/gpp/messages/admin.py	Mon Jan 10 04:22:21 2011 +0000
@@ -1,10 +1,18 @@
 """
 This file contains the automatic admin site definitions for the Message models.
 """
+from django.contrib import admin
 
-from django.contrib import admin
 from messages.models import Message
 from messages.models import Options
 
-admin.site.register(Message)
+
+class MessageAdmin(admin.ModelAdmin):
+    list_display = ('sender', 'receiver', 'send_date', 'subject')
+    raw_id_fields = ('sender', 'receiver')
+    exclude = ('html', )
+    date_hierarchy = 'send_date'
+    list_display_links = ('subject', )
+
+admin.site.register(Message, MessageAdmin)
 admin.site.register(Options)
diff -r 4f032a6e21f8 -r c7c427411f03 gpp/templates/messages/notification_email.txt
--- a/gpp/templates/messages/notification_email.txt	Mon Jan 10 03:33:21 2011 +0000
+++ b/gpp/templates/messages/notification_email.txt	Mon Jan 10 04:22:21 2011 +0000
@@ -3,10 +3,14 @@
 You have just received a new private message at {{ site.name }}. The message
 details are as follows:
 
+-----
 From: {{ msg.sender.username }}
 Subject: {{ msg.subject }}
 
-You may read this message by visiting the following link:
+{{ msg.message }}
+-----
+
+You may reply to this message by visiting the following link:
 
 http://{{ site.domain }}{{ msg.get_absolute_url }}
 
@@ -22,3 +26,4 @@
 
 http://{{ site.domain }}{{ options_url }}
 
+This is an automated email, please do not reply to this message.