Skip to content

Commit 2df0811

Browse files
committed
Actually add the message app
- Legacy-Id: 3857
1 parent 89314a0 commit 2df0811

3 files changed

Lines changed: 62 additions & 0 deletions

File tree

ietf/message/__init__.py

Whitespace-only changes.

ietf/message/admin.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
from django.contrib import admin
2+
3+
from ietf.message.models import *
4+
5+
class MessageAdmin(admin.ModelAdmin):
6+
list_display = ["subject", "by", "time", "groups"]
7+
search_fields = ["subject", "body"]
8+
raw_id_fields = ["by"]
9+
10+
def groups(self, instance):
11+
return ", ".join(g.acronym for g in instance.related_groups.all())
12+
13+
admin.site.register(Message, MessageAdmin)
14+
15+
class SendQueueAdmin(admin.ModelAdmin):
16+
list_display = ["time", "by", "message", "send_at", "sent_at"]
17+
list_filter = ["time", "send_at", "sent_at"]
18+
search_fields = ["message__body"]
19+
raw_id_fields = ["by"]
20+
21+
admin.site.register(SendQueue, SendQueueAdmin)

ietf/message/models.py

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
from django.db import models
2+
3+
import datetime
4+
5+
from ietf.person.models import Email, Person
6+
from ietf.group.models import Group
7+
8+
class Message(models.Model):
9+
time = models.DateTimeField(default=datetime.datetime.now)
10+
by = models.ForeignKey(Person)
11+
12+
subject = models.CharField(max_length=255)
13+
frm = models.CharField(max_length=255)
14+
to = models.CharField(max_length=1024)
15+
cc = models.CharField(max_length=1024, blank=True)
16+
bcc = models.CharField(max_length=255, blank=True)
17+
reply_to = models.CharField(max_length=255, blank=True)
18+
body = models.TextField()
19+
content_type = models.CharField(max_length=255, blank=True)
20+
21+
related_groups = models.ManyToManyField(Group, blank=True)
22+
23+
class Meta:
24+
ordering = ['time']
25+
26+
def __unicode__(self):
27+
return "'%s' %s -> %s" % (self.subject, self.frm, self.to)
28+
29+
class SendQueue(models.Model):
30+
time = models.DateTimeField(default=datetime.datetime.now)
31+
by = models.ForeignKey(Person)
32+
33+
message = models.ForeignKey(Message)
34+
35+
send_at = models.DateTimeField(blank=True, null=True)
36+
sent_at = models.DateTimeField(blank=True, null=True)
37+
38+
note = models.TextField(blank=True)
39+
40+
class Meta:
41+
ordering = ['time']

0 commit comments

Comments
 (0)