From 7875158f6f348c0d4dbcf0ef48915dcae936be78 Mon Sep 17 00:00:00 2001 From: Kenneth Love Date: Mon, 16 Jan 2012 17:47:53 -0800 Subject: [PATCH] converted template to use real form --- djrill/templates/djrill/senders_list.html | 17 +++++++---------- djrill/views.py | 19 ++++++++++++++++--- urls.py | 3 +++ 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/djrill/templates/djrill/senders_list.html b/djrill/templates/djrill/senders_list.html index 1083fc5..b58832e 100644 --- a/djrill/templates/djrill/senders_list.html +++ b/djrill/templates/djrill/senders_list.html @@ -15,15 +15,6 @@ {% block extrahead %} {{ block.super }} {{ media.js }} -{% if action_form %}{% if actions_on_top or actions_on_bottom %} - -{% endif %}{% endif %} {% endblock %} {% block bodyclass %}change-list{% endblock %} @@ -89,7 +80,13 @@ {{ item }} {% endfor %} {% if result.is_enabled and result.approved_at %} - + +
+ + {% csrf_token %} +
{% endif %} diff --git a/djrill/views.py b/djrill/views.py index b76d035..4f373f0 100644 --- a/djrill/views.py +++ b/djrill/views.py @@ -1,3 +1,4 @@ +from django import forms from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django.http import HttpResponse, HttpResponseForbidden @@ -10,6 +11,15 @@ except ImportError: raise ImportError("Install the damn requirements!") +class DjrillAdminMedia(object): + def _media(self): + js = ["js/core.js", "js/jquery.min.js", "js/jquery.init.js"] + + return forms.Media(js=["%s%s" % (settings.ADMIN_MEDIA_PREFIX, url) + for url in js]) + media = property(_media) + + class DjrillApiMixin(object): """ Simple Mixin to grab the api info from the settings file. @@ -52,15 +62,18 @@ class DjrillIndexView(DjrillApiMixin, TemplateView): return self.render_to_response({"status": json.loads(req.content)}) -class DjrillSendersListView(DjrillApiMixin, DjrillApiJsonObjectsMixin, - TemplateView): +class DjrillSendersListView(DjrillAdminMedia, DjrillApiMixin, + DjrillApiJsonObjectsMixin, TemplateView): api_uri = "users/senders.json" template_name = "djrill/senders_list.html" def get(self, request): objects = self.get_json_objects() - return self.render_to_response({"objects": json.loads(objects)}) + return self.render_to_response({ + "objects": json.loads(objects), + "media": self.media + }) class DjrillDisableSenderView(DjrillApiMixin, View): diff --git a/urls.py b/urls.py index 9208c09..b312cb1 100644 --- a/urls.py +++ b/urls.py @@ -1,5 +1,6 @@ from django.conf.urls.defaults import patterns, include, url from django.contrib import admin +from django.contrib.staticfiles.urls import staticfiles_urlpatterns from djrill import DjrillAdminSite @@ -14,3 +15,5 @@ urlpatterns = patterns('', # Uncomment the next line to enable the admin: url(r'^admin/', include(admin.site.urls)), ) + +urlpatterns += staticfiles_urlpatterns()