Permalink
Browse files

Small tweaks to get the tests passing again.

  • Loading branch information...
1 parent 0c9c2a4 commit 8d76804400de93612e426b7a58c38ce8ef67c623 @alexsdutton alexsdutton committed Jan 15, 2012
Showing with 3 additions and 4 deletions.
  1. +1 −1 openorg_timeseries/tests/settings.py
  2. +2 −2 openorg_timeseries/tests/urls.py
  3. +0 −1 openorg_timeseries/views/admin.py
@@ -20,7 +20,7 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.RemoteUserMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
- 'django_conneg.middleware.BasicAuthMiddleware',
+ 'django_conneg.support.middleware.BasicAuthMiddleware',
# 'django.middleware.http.ConditionalGetMiddleware',
# 'django.middleware.gzip.GZipMiddleware',
)
@@ -1,6 +1,6 @@
from django.conf.urls.defaults import patterns, url, include
urlpatterns = patterns('',
- url(r'^endpoint/', include('openorg_timeseries.urls.endpoint')),
- url(r'^admin/', include('openorg_timeseries.urls.admin', 'timeseries')),
+ url(r'^endpoint/', include('openorg_timeseries.urls.endpoint', 'timeseries-endpoint')),
+ url(r'^admin/', include('openorg_timeseries.urls.admin', 'timeseries-admin')),
)
@@ -32,7 +32,6 @@ class ErrorView(HTMLView, JSONPView, TextView):
_force_fallback_format = 'json'
def dispatch(self, request, context, template_name):
- request.renderers = self.get_renderers(request)
template_name = (template_name, 'timeseries-admin/error')
return self.render(request, context, template_name)

0 comments on commit 8d76804

Please sign in to comment.