Skip to content

Commit

Permalink
Fixed up project to be compatible with NFA version of trunk.
Browse files Browse the repository at this point in the history
git-svn-id: http://django-notification.googlecode.com/svn/trunk@83 590c3fc9-4838-0410-bb95-17a0c9b37ca9
  • Loading branch information
empty committed Jul 19, 2008
1 parent ff055ed commit 4d25586
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 deletions.
17 changes: 17 additions & 0 deletions notification/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from django.contrib import admin
from notification.models import NoticeType, NoticeSetting, Notice, ObservedItem

class NoticeTypeAdmin(admin.ModelAdmin):
list_display = ('label', 'display', 'description', 'default')

class NoticeSettingAdmin(admin.ModelAdmin):
list_display = ('id', 'user', 'notice_type', 'medium', 'send')

class NoticeAdmin(admin.ModelAdmin):
list_display = ('message', 'user', 'notice_type', 'added', 'unseen', 'archived')


admin.site.register(NoticeType, NoticeTypeAdmin)
admin.site.register(NoticeSetting, NoticeSettingAdmin)
admin.site.register(Notice, NoticeAdmin)
admin.site.register(ObservedItem)
12 changes: 0 additions & 12 deletions notification/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ class NoticeType(models.Model):
def __unicode__(self):
return self.label

class Admin:
list_display = ('label', 'display', 'description', 'default')

class Meta:
verbose_name = _("notice type")
verbose_name_plural = _("notice types")
Expand All @@ -63,9 +60,6 @@ class NoticeSetting(models.Model):
medium = models.CharField(_('medium'), max_length=1, choices=NOTICE_MEDIA)
send = models.BooleanField(_('send'))

class Admin:
list_display = ('id', 'user', 'notice_type', 'medium', 'send')

class Meta:
verbose_name = _("notice setting")
verbose_name_plural = _("notice settings")
Expand Down Expand Up @@ -147,9 +141,6 @@ class Meta:
verbose_name = _("notice")
verbose_name_plural = _("notices")

class Admin:
list_display = ('message', 'user', 'notice_type', 'added', 'unseen', 'archived')

def create_notice_type(label, display, description, default=2):
"""
Creates a new NoticeType.
Expand Down Expand Up @@ -300,9 +291,6 @@ class Meta:
verbose_name = _('observed item')
verbose_name_plural = _('observed items')

class Admin:
pass

def send_notice(self):
send([self.user], self.notice_type.label, self.message_template,
[self.observed_object])
Expand Down

0 comments on commit 4d25586

Please sign in to comment.