Fixed a bug where the 'run task now' action was appearing on all Admi…

…n pages.
mollyproject · Mar 28, 2012 · c85e7ac · c85e7ac
1 parent a6b310e
commit c85e7ac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/molly/conf/admin.py b/molly/conf/admin.py
@@ -1,5 +1,6 @@
 from celery.app import current_app
 from molly.conf.applications import init_providers
+from djcelery.admin import PeriodicTaskAdmin
 
 
 def run_now(modeladmin, request, queryset):
@@ -11,3 +12,7 @@ def run_now(modeladmin, request, queryset):
             init_providers()
             app.tasks[pt.task].apply_async()
 run_now.short_description = "Place this task on queue to run now."
+
+
+class RunnablePeriodicTaskAdmin(PeriodicTaskAdmin):
+    actions = [run_now]
diff --git a/molly/urls.py b/molly/urls.py
@@ -1,16 +1,17 @@
 from django.conf.urls.defaults import *
 from django.conf import settings
 from django.contrib import admin
-from djcelery.admin import PeriodicTaskAdmin
+from djcelery.models import PeriodicTask
 
+from molly.conf.admin import RunnablePeriodicTaskAdmin
 from molly.conf.applications import applications, all_apps
-from molly.conf.admin import run_now
 from molly.utils.views import ReverseView
 from molly.utils.i18n import SetLanguageView, javascript_catalog
 
 # Admin
-PeriodicTaskAdmin.actions.append(run_now)
 admin.autodiscover()
+admin.site.unregister(PeriodicTask)
+admin.site.register(PeriodicTask, RunnablePeriodicTaskAdmin)
 
 urlpatterns = patterns('',
     (r'^adm/', include(admin.site.urls)), # Admin site