summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-09-16 12:14:48 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-09-16 12:14:48 +0000
commite9656180eadf44fd507f89ffe02fbb628eaccca1 (patch)
treedf0cf1408f360042d0f39d697d404c5bc3502e1d
parent1ef4f5eac64507eb2c0ba5b8babe0229f2803117 (diff)
Fixed #1394 -- Fixed an admin crash when saving models with pk db column != pk attname.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/views/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index cfbe9a1f95..7fa870e222 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -140,7 +140,7 @@ class AdminBoundField(object):
def original_value(self):
if self.original:
- return self.original.__dict__[self.field.column]
+ return self.original.__dict__[self.field.attname]
def existing_display(self):
try: