aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2011-05-27 10:35:43 +0100
committerTom Christie2011-05-27 10:35:43 +0100
commit9e9ae6094943d663a677b3bbe8e8af6a43744daf (patch)
tree043cf219244176eeff3c67a6a87d6a32ed5efe73
parentcefc6a25c239411f17740742a121a1045563d90c (diff)
downloaddjango-rest-framework-9e9ae6094943d663a677b3bbe8e8af6a43744daf.tar.bz2
forms/models can be set on the view as well as the resource
-rw-r--r--djangorestframework/mixins.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py
index 7bed131b..3c05bef0 100644
--- a/djangorestframework/mixins.py
+++ b/djangorestframework/mixins.py
@@ -410,9 +410,9 @@ class ResourceMixin(object):
def _resource(self):
if self.resource:
return self.resource(self)
- elif hasattr(self, 'model'):
+ elif getattr(self, 'model', None):
return ModelResource(self)
- elif hasattr(self, 'form'):
+ elif getattr(self, 'form', None):
return FormResource(self)
return Resource(self)