diff options
| author | GitHub Merge Button | 2011-07-01 03:34:10 -0700 |
|---|---|---|
| committer | GitHub Merge Button | 2011-07-01 03:34:10 -0700 |
| commit | 892e4eea985bbed64c0c721230e05111a6392299 (patch) | |
| tree | 669567c3f51329e0afc7d4e975b409a57a3866fe /djangorestframework/mixins.py | |
| parent | 16d8c3255d549d410b04d86ab82d024ff2f79d66 (diff) | |
| parent | 60cd5363ab1343260c4ed8322d2d26064d56c3d3 (diff) | |
| download | django-rest-framework-892e4eea985bbed64c0c721230e05111a6392299.tar.bz2 | |
Merge 60cd5363ab1343260c4ed8322d2d26064d56c3d3 into 16d8c3255d549d410b04d86ab82d024ff2f79d66
Diffstat (limited to 'djangorestframework/mixins.py')
| -rw-r--r-- | djangorestframework/mixins.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py index 9bd7598e..b1ba0596 100644 --- a/djangorestframework/mixins.py +++ b/djangorestframework/mixins.py @@ -491,17 +491,17 @@ class ReadModelMixin(object): try: if args: # If we have any none kwargs then assume the last represents the primrary key - instance = model.objects.get(pk=args[-1], **kwargs) + self.model_instance = model.objects.get(pk=args[-1], **kwargs) else: # Otherwise assume the kwargs uniquely identify the model filtered_keywords = kwargs.copy() if BaseRenderer._FORMAT_QUERY_PARAM in filtered_keywords: del filtered_keywords[BaseRenderer._FORMAT_QUERY_PARAM] - instance = model.objects.get(**filtered_keywords) + self.model_instance = model.objects.get(**filtered_keywords) except model.DoesNotExist: raise ErrorResponse(status.HTTP_404_NOT_FOUND) - return instance + return self.model_instance class CreateModelMixin(object): @@ -540,19 +540,19 @@ class UpdateModelMixin(object): try: if args: # If we have any none kwargs then assume the last represents the primrary key - instance = model.objects.get(pk=args[-1], **kwargs) + self.model_instance = model.objects.get(pk=args[-1], **kwargs) else: # Otherwise assume the kwargs uniquely identify the model - instance = model.objects.get(**kwargs) + self.model_instance = model.objects.get(**kwargs) for (key, val) in self.CONTENT.items(): - setattr(instance, key, val) + setattr(self.model_instance, key, val) except model.DoesNotExist: - instance = model(**self.CONTENT) - instance.save() + self.model_instance = model(**self.CONTENT) + self.model_instance.save() - instance.save() - return instance + self.model_instance.save() + return self.model_instance class DeleteModelMixin(object): |
