Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

magic-removal: Fixed #1313 -- Bugfixes for magic-removal. Thanks, jpa…

…ulofarias

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 52b2dd620f23f2c93230e03e113fbd4fb679394d 1 parent 171c1a5
@adrianholovaty adrianholovaty authored
View
2  django/contrib/admin/models.py
@@ -9,7 +9,7 @@
class LogEntryManager(models.Manager):
def log_action(self, user_id, content_type_id, object_id, object_repr, action_flag, change_message=''):
- e = self.klass(None, None, user_id, content_type_id, object_id, object_repr[:200], action_flag, change_message)
+ e = self.model(None, None, user_id, content_type_id, object_id, object_repr[:200], action_flag, change_message)
e.save()
class LogEntry(models.Model):
View
2  django/db/models/fields/__init__.py
@@ -32,7 +32,7 @@ def manipulator_validator_unique(f, opts, self, field_data, all_data):
"Validates that the value is unique for this field."
lookup_type = f.get_validator_unique_lookup_type()
try:
- old_obj = self.manager.get_object(**{lookup_type: field_data})
+ old_obj = self.manager.get(**{lookup_type: field_data})
except ObjectDoesNotExist:
return
if getattr(self, 'original_object', None) and self.original_object._get_pk_val() == old_obj._get_pk_val():
Please sign in to comment.
Something went wrong with that request. Please try again.