Hooking in djcelery admin to our admin interface

adding CeleryTask to the admin interface
pull/1/head
Raymond Yee 2012-03-30 12:27:35 -07:00
parent 69dde055b5
commit 55b3e8398e
2 changed files with 20 additions and 1 deletions

View File

@ -5,6 +5,9 @@ from django.contrib.admin.sites import AdminSite
from regluit.core import models from regluit.core import models
from regluit import payment from regluit import payment
from djcelery.admin import TaskState, WorkerState, TaskMonitor, WorkerMonitor, \
IntervalSchedule, CrontabSchedule, PeriodicTask, PeriodicTaskAdmin
class RegluitAdmin(AdminSite): class RegluitAdmin(AdminSite):
login_template = 'registration/login.html' login_template = 'registration/login.html'
@ -53,6 +56,9 @@ class WishlistAdmin(ModelAdmin):
class UserProfileAdmin(ModelAdmin): class UserProfileAdmin(ModelAdmin):
date_hierarchy = 'created' date_hierarchy = 'created'
class CeleryTaskAdmin(ModelAdmin):
pass
class TransactionAdmin(ModelAdmin): class TransactionAdmin(ModelAdmin):
date_hierarchy = 'date_created' date_hierarchy = 'date_created'
@ -77,6 +83,19 @@ admin_site.register(models.Edition, EditionAdmin)
admin_site.register(models.Ebook, EbookAdmin) admin_site.register(models.Ebook, EbookAdmin)
admin_site.register(models.Wishlist, WishlistAdmin) admin_site.register(models.Wishlist, WishlistAdmin)
admin_site.register(models.UserProfile, UserProfileAdmin) admin_site.register(models.UserProfile, UserProfileAdmin)
admin_site.register(models.CeleryTask, CeleryTaskAdmin)
# payments
admin_site.register(payment.models.Transaction, TransactionAdmin) admin_site.register(payment.models.Transaction, TransactionAdmin)
admin_site.register(payment.models.PaymentResponse, PaymentResponseAdmin) admin_site.register(payment.models.PaymentResponse, PaymentResponseAdmin)
admin_site.register(payment.models.Receiver, ReceiverAdmin) admin_site.register(payment.models.Receiver, ReceiverAdmin)
# add the djcelery admin interface
# https://raw.github.com/ask/django-celery/2.4/djcelery/admin.py
admin_site.register(TaskState, TaskMonitor)
admin_site.register(WorkerState, WorkerMonitor)
admin_site.register(IntervalSchedule)
admin_site.register(CrontabSchedule)
admin_site.register(PeriodicTask, PeriodicTaskAdmin)

View File

@ -26,7 +26,7 @@ class CeleryTask(models.Model):
active = models.NullBooleanField(default=True) active = models.NullBooleanField(default=True)
def __unicode__(self): def __unicode__(self):
return "Task %s arg:%d ID# %s %s: State %s " % (self.function_name, self.function_args, self.task_id, self.description, self.state) return "Task %s arg:%s ID# %s %s: State %s " % (self.function_name, self.function_args, self.task_id, self.description, self.state)
@property @property
def AsyncResult(self): def AsyncResult(self):