diff options
| author | Tai Lee | 2013-09-14 00:54:44 +1000 |
|---|---|---|
| committer | Tai Lee | 2013-09-14 00:54:44 +1000 |
| commit | a9dbd46c9470003a1dd41e66a113d50b0217a110 (patch) | |
| tree | 37969909ed6c41f550553ffa55287a9a8069ca84 /rest_framework | |
| parent | bb3261ca489104e3dea434aa11d76f370e938ca8 (diff) | |
| download | django-rest-framework-a9dbd46c9470003a1dd41e66a113d50b0217a110.tar.bz2 | |
Refs #1109 -- Update docs. Integrate changes from feedback.
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/renderers.py | 13 | ||||
| -rw-r--r-- | rest_framework/templates/rest_framework/base.html | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 6597123f..2ce51e97 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -568,9 +568,6 @@ class BrowsableAPIRenderer(BaseRenderer): """ Returns the context used to render. """ - self.accepted_media_type = accepted_media_type or '' - self.renderer_context = renderer_context or {} - view = renderer_context['view'] request = renderer_context['request'] response = renderer_context['response'] @@ -581,7 +578,7 @@ class BrowsableAPIRenderer(BaseRenderer): raw_data_patch_form = self.get_raw_data_form(view, 'PATCH', request) raw_data_put_or_patch_form = raw_data_put_form or raw_data_patch_form - context = RequestContext(request, { + context = { 'content': self.get_content(renderer, data, accepted_media_type, renderer_context), 'view': view, 'request': request, @@ -604,18 +601,22 @@ class BrowsableAPIRenderer(BaseRenderer): 'raw_data_patch_form': raw_data_patch_form, 'raw_data_put_or_patch_form': raw_data_put_or_patch_form, - 'allow_form': bool(response.status_code != 403), + 'display_edit_forms': bool(response.status_code != 403), 'api_settings': api_settings - }) + } return context def render(self, data, accepted_media_type=None, renderer_context=None): """ Render the HTML for the browsable API representation. """ + self.accepted_media_type = accepted_media_type or '' + self.renderer_context = renderer_context or {} + template = loader.get_template(self.template) context = self.get_context(data, accepted_media_type, renderer_context) + context = RequestContext(renderer_context['request'], context) ret = template.render(context) # Munge DELETE Response code to allow us to return content diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html index 88e58deb..2776d550 100644 --- a/rest_framework/templates/rest_framework/base.html +++ b/rest_framework/templates/rest_framework/base.html @@ -122,7 +122,7 @@ </div> </div> - {% if allow_form %} + {% if display_edit_forms %} {% if post_form or raw_data_post_form %} <div {% if post_form %}class="tabbable"{% endif %}> |