From 51ac8747d9d3974b7d4b8dc9da958ceea1d8aaa9 Mon Sep 17 00:00:00 2001 From: Steve Pulec Date: Tue, 20 Sep 2011 14:56:03 -0400 Subject: [PATCH 1/4] Resetting script prefix back to default after view processing --- djangorestframework/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/djangorestframework/views.py b/djangorestframework/views.py index 5f8e84cd2..fabf57272 100644 --- a/djangorestframework/views.py +++ b/djangorestframework/views.py @@ -156,7 +156,10 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView): # merge with headers possibly set at some point in the view response.headers.update(self.headers) - return self.render(response) + result = self.render(response) + set_script_prefix("/") + + return result class ModelView(View): From 5f09c316d4aef9d43d9ca92e7f75f67fbd4c7ae9 Mon Sep 17 00:00:00 2001 From: Ben Plesser Date: Wed, 21 Sep 2011 14:59:05 -0400 Subject: [PATCH 2/4] remove script prefix --- djangorestframework/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/djangorestframework/views.py b/djangorestframework/views.py index fabf57272..108327eea 100644 --- a/djangorestframework/views.py +++ b/djangorestframework/views.py @@ -113,8 +113,8 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView): self.headers = {} # Calls to 'reverse' will not be fully qualified unless we set the scheme/host/port here. - prefix = '%s://%s' % (request.is_secure() and 'https' or 'http', request.get_host()) - set_script_prefix(prefix) + #prefix = '%s://%s' % (request.is_secure() and 'https' or 'http', request.get_host()) + #set_script_prefix(prefix) try: self.initial(request, *args, **kwargs) @@ -157,7 +157,7 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView): response.headers.update(self.headers) result = self.render(response) - set_script_prefix("/") + #set_script_prefix("/") return result From 6309f32b6b2e18f69e9787fbf6b0e9dedecc5555 Mon Sep 17 00:00:00 2001 From: Ben Plesser Date: Thu, 22 Sep 2011 12:03:12 -0400 Subject: [PATCH 3/4] Fixed favicon issues by changing the renderer.html template. --- djangorestframework/templates/renderer.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/djangorestframework/templates/renderer.html b/djangorestframework/templates/renderer.html index 3dd5faf3a..1cbce1175 100644 --- a/djangorestframework/templates/renderer.html +++ b/djangorestframework/templates/renderer.html @@ -13,14 +13,15 @@ - Django REST framework - {{ name }} + + Yipit's RESTful Framework - {{ name }}