diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2005-08-29 16:49:18 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2005-08-29 16:49:18 +0000 |
| commit | 299c3cdd8c5c83a2936cf84dc9d6745db9b39454 (patch) | |
| tree | 463666e288180e18bb1ef93f4d22aa772aef202a | |
| parent | 2ce78063fa07ee3ebbae6eb5c00cc251b89da66f (diff) | |
Fixed small bug in manipulator handling of one-to-one-related foreign keys
git-svn-id: http://code.djangoproject.com/svn/django/trunk@572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/core/meta/__init__.py | 2 | ||||
| -rw-r--r-- | django/views/admin/main.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/core/meta/__init__.py b/django/core/meta/__init__.py index 9d807ed892..02e264607b 100644 --- a/django/core/meta/__init__.py +++ b/django/core/meta/__init__.py @@ -1456,7 +1456,7 @@ def manipulator_save(opts, klass, add, change, self, new_data): params[f.column] = f.get_manipulator_new_data(new_data) if change: - params[opts.pk.name] = self.obj_key + params[opts.pk.column] = self.obj_key # First, save the basic object itself. new_object = klass(**params) diff --git a/django/views/admin/main.py b/django/views/admin/main.py index 738dd15cea..17bfa12d8b 100644 --- a/django/views/admin/main.py +++ b/django/views/admin/main.py @@ -876,7 +876,7 @@ def change_stage(request, app_label, module_name, object_id): new_data.setlist(f.name, new_data[f.name].split(",")) manipulator.do_html2python(new_data) new_object = manipulator.save(new_data) - pk_value = getattr(new_object, opts.pk.name) + pk_value = getattr(new_object, opts.pk.column) # Construct the change message. change_message = [] |