diff options
| author | Ben Timby | 2012-01-24 14:11:10 -0500 |
|---|---|---|
| committer | Ben Timby | 2012-01-24 14:11:10 -0500 |
| commit | 049d417ebc2c88b6aeed7946efdb3baeab9a4432 (patch) | |
| tree | e50d5e502519c8e41bc7e82a47c8709c83340caf | |
| parent | 7fa3a214fbd33dac61d3f8836e2c4aeda3149647 (diff) | |
| download | django-rest-framework-049d417ebc2c88b6aeed7946efdb3baeab9a4432.tar.bz2 | |
Reverted formatting
| -rw-r--r-- | djangorestframework/renderers.py | 18 | ||||
| -rw-r--r-- | djangorestframework/templates/renderer.html | 11 | ||||
| -rw-r--r-- | djangorestframework/views.py | 10 |
3 files changed, 23 insertions, 16 deletions
diff --git a/djangorestframework/renderers.py b/djangorestframework/renderers.py index 5338c383..bb0f789a 100644 --- a/djangorestframework/renderers.py +++ b/djangorestframework/renderers.py @@ -225,7 +225,6 @@ class DocumentingTemplateRenderer(BaseRenderer): return content - def _get_form_instance(self, view, method): """ Get a form, possibly bound to either the input or output data. @@ -261,7 +260,6 @@ class DocumentingTemplateRenderer(BaseRenderer): return form_instance - def _get_generic_content_form(self, view): """ Returns a form that allows for arbitrary content types to be tunneled via standard HTML forms @@ -340,7 +338,7 @@ class DocumentingTemplateRenderer(BaseRenderer): context = RequestContext(self.view.request, { 'content': content, 'view': self.view, - 'request': self.view.request, # TODO: remove + 'request': self.view.request, # TODO: remove 'response': self.view.response, 'description': description, 'name': name, @@ -402,12 +400,14 @@ class DocumentingPlainTextRenderer(DocumentingTemplateRenderer): template = 'renderer.txt' -DEFAULT_RENDERERS = ( JSONRenderer, - JSONPRenderer, - DocumentingHTMLRenderer, - DocumentingXHTMLRenderer, - DocumentingPlainTextRenderer, - XMLRenderer ) +DEFAULT_RENDERERS = ( + JSONRenderer, + JSONPRenderer, + DocumentingHTMLRenderer, + DocumentingXHTMLRenderer, + DocumentingPlainTextRenderer, + XMLRenderer +) if YAMLRenderer: DEFAULT_RENDERERS += (YAMLRenderer,) diff --git a/djangorestframework/templates/renderer.html b/djangorestframework/templates/renderer.html index 3b33a6ff..ff761023 100644 --- a/djangorestframework/templates/renderer.html +++ b/djangorestframework/templates/renderer.html @@ -11,9 +11,14 @@ /* Custom styles */ .version{font-size:8px;} </style> - <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/base.css'/> - <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/forms.css'/> - <title>Django REST framework - {{ name }}</title> + {% if ADMIN_MEDIA_PREFIX %} + <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/base.css'/> + <link rel="stylesheet" type="text/css" href='{{ADMIN_MEDIA_PREFIX}}css/forms.css'/> + {% else %} + <link rel="stylesheet" type="text/css" href='{{STATIC_URL}}admin/css/base.css'/> + <link rel="stylesheet" type="text/css" href='{{STATIC_URL}}admin/css/forms.css'/> + {% endif %} + <title>Django REST framework - {{ name }}</title> </head> <body> <div id="container"> diff --git a/djangorestframework/views.py b/djangorestframework/views.py index 9dd84bf2..d89c2afd 100644 --- a/djangorestframework/views.py +++ b/djangorestframework/views.py @@ -27,7 +27,6 @@ __all__ = ( ) - class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView): """ Handles incoming requests and maps them to REST operations. @@ -50,13 +49,13 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView): List of parsers the resource can parse the request with. """ - authentication = ( authentication.UserLoggedInAuthentication, - authentication.BasicAuthentication ) + authentication = (authentication.UserLoggedInAuthentication, + authentication.BasicAuthentication) """ List of all authenticating methods to attempt. """ - permissions = ( permissions.FullAnonAccess, ) + permissions = (permissions.FullAnonAccess,) """ List of all permissions that must be checked. """ @@ -240,18 +239,21 @@ class ModelView(View): """ resource = resources.ModelResource + class InstanceModelView(InstanceMixin, ReadModelMixin, UpdateModelMixin, DeleteModelMixin, ModelView): """ A view which provides default operations for read/update/delete against a model instance. """ _suffix = 'Instance' + class ListModelView(ListModelMixin, ModelView): """ A view which provides default operations for list, against a model in the database. """ _suffix = 'List' + class ListOrCreateModelView(ListModelMixin, CreateModelMixin, ModelView): """ A view which provides default operations for list and create, against a model in the database. |