resources: bug fix + better error messages

djangorestframework/resources.py

@@ -536,34 +536,33 @@ class ModelResource(FormResource):
         """
         Return the model class for this resource.
         """
-        if hasattr(self, 'model'):
+        model = getattr(self, 'model', None)
-            return self.model
+        if model is None:
-        elif hasattr(self.view, 'model'):
+            model = getattr(self.view, 'model', None)
-            return self.view.model
+            if model is None:
-        else:
                 raise ImproperlyConfigured(u"%(cls)s is missing a model. Define "
                                            u"%(cls)s.model." % {
                                                 'cls': self.__class__
                                            })
+        return model
 
     def get_queryset(self):
         """
         Return the queryset that should be used when retrieving or listing
         instances.
         """
-        if hasattr(self, 'queryset'):
+        queryset = getattr(self, 'queryset', None)
-            queryset = self.queryset
+        if queryset is None:
-        elif hasattr (self.view, 'queryset'):
+            queryset = getattr(self.view, 'queryset', None)
-            queryset = self.view.queryset
+            if queryset is None:
-        else:
+                try:
                     model = self.get_model()
-            if model:
+                except ImproperlyConfigured:
-                queryset = model._default_manager.all()
-            else:
                     raise ImproperlyConfigured(u"%(cls)s is missing a queryset. Define "
                                                u"%(cls)s.model or %(cls)s.queryset." % {
                                                     'cls': self.__class__
 	                                           })
+                queryset = model._default_manager.all()
         return queryset._clone()
 
     def get_ordering(self):