From 9e9ae6094943d663a677b3bbe8e8af6a43744daf Mon Sep 17 00:00:00 2001
From: Tom Christie <tomchristie@bright-interactive.co.uk>
Date: Fri, 27 May 2011 10:35:43 +0100
Subject: [PATCH] forms/models can be set on the view as well as the resource

---
 djangorestframework/mixins.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py
index 7bed131bc..3c05bef02 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)