diff options
| author | Carl Meyer <carl@oddbird.net> | 2011-09-21 14:00:58 +0000 |
|---|---|---|
| committer | Carl Meyer <carl@oddbird.net> | 2011-09-21 14:00:58 +0000 |
| commit | 09a01435de65989864d56a8bf74ff2d84e9c4bd5 (patch) | |
| tree | 09dcc1d3b62a69dc264fc47f6e47b9aaf05ddc19 /django | |
| parent | b22a4fdc710684e089fd6135ac4c94b51fea2a3e (diff) | |
Fixed #16838 -- Corrected broken add-another inline JS in admin with related_name="+". Thanks jamesp for report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 2825c99988..f05b5cb3a7 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -926,7 +926,7 @@ class ModelAdmin(BaseModelAdmin): for FormSet, inline in zip(self.get_formsets(request), self.inline_instances): prefix = FormSet.get_default_prefix() prefixes[prefix] = prefixes.get(prefix, 0) + 1 - if prefixes[prefix] != 1: + if prefixes[prefix] != 1 or not prefix: prefix = "%s-%s" % (prefix, prefixes[prefix]) formset = FormSet(data=request.POST, files=request.FILES, instance=new_object, @@ -955,7 +955,7 @@ class ModelAdmin(BaseModelAdmin): self.inline_instances): prefix = FormSet.get_default_prefix() prefixes[prefix] = prefixes.get(prefix, 0) + 1 - if prefixes[prefix] != 1: + if prefixes[prefix] != 1 or not prefix: prefix = "%s-%s" % (prefix, prefixes[prefix]) formset = FormSet(instance=self.model(), prefix=prefix, queryset=inline.queryset(request)) @@ -1025,7 +1025,7 @@ class ModelAdmin(BaseModelAdmin): self.inline_instances): prefix = FormSet.get_default_prefix() prefixes[prefix] = prefixes.get(prefix, 0) + 1 - if prefixes[prefix] != 1: + if prefixes[prefix] != 1 or not prefix: prefix = "%s-%s" % (prefix, prefixes[prefix]) formset = FormSet(request.POST, request.FILES, instance=new_object, prefix=prefix, @@ -1046,7 +1046,7 @@ class ModelAdmin(BaseModelAdmin): for FormSet, inline in zip(self.get_formsets(request, obj), self.inline_instances): prefix = FormSet.get_default_prefix() prefixes[prefix] = prefixes.get(prefix, 0) + 1 - if prefixes[prefix] != 1: + if prefixes[prefix] != 1 or not prefix: prefix = "%s-%s" % (prefix, prefixes[prefix]) formset = FormSet(instance=obj, prefix=prefix, queryset=inline.queryset(request)) |