mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 01:39:20 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Revmoved some old dead code and whitespace cleanup.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Joseph Kocherhans 2008-07-15 04:38:10 +00:00
parent 85eb8b3fd3
commit affc9b9b3b
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
django/contrib/admin/options.py
View File

@ -379,7 +379,7 @@ class ModelAdmin(BaseModelAdmin):
if request.POST.has_key("_popup"): if request.POST.has_key("_popup"):
post_url_continue += "?_popup=1" post_url_continue += "?_popup=1"
return HttpResponseRedirect(post_url_continue % pk_value) return HttpResponseRedirect(post_url_continue % pk_value)
if request.POST.has_key("_popup"): if request.POST.has_key("_popup"):
return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \ return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \
# escape() calls force_unicode. # escape() calls force_unicode.
@ -416,7 +416,7 @@ class ModelAdmin(BaseModelAdmin):
for formset in formsets: for formset in formsets:
formset.save() formset.save()
# Construct the change message. # Construct the change message.
change_message = [] change_message = []
if form.changed_data: if form.changed_data:
change_message.append(_('Changed %s.') % get_text_list(form.changed_data, _('and'))) change_message.append(_('Changed %s.') % get_text_list(form.changed_data, _('and')))
@ -581,20 +581,6 @@ class ModelAdmin(BaseModelAdmin):
inline_formset = FormSet(instance=obj) inline_formset = FormSet(instance=obj)
inline_formsets.append(inline_formset) inline_formsets.append(inline_formset)
## Populate the FormWrapper.
#oldform = oldforms.FormWrapper(manipulator, new_data, errors)
#oldform.original = manipulator.original_object
#oldform.order_objects = []
## TODO: Should be done in flatten_data / FormWrapper construction
#for related in opts.get_followed_related_objects():
#wrt = related.opts.order_with_respect_to
#if wrt and wrt.rel and wrt.rel.to == opts:
#func = getattr(manipulator.original_object, 'get_%s_list' %
#related.get_accessor_name())
#orig_list = func()
#oldform.order_objects.extend(orig_list)
adminForm = AdminForm(form, self.get_fieldsets(request, obj), self.prepopulated_fields) adminForm = AdminForm(form, self.get_fieldsets(request, obj), self.prepopulated_fields)
media = self.media + adminForm.media media = self.media + adminForm.media
for fs in inline_formsets: for fs in inline_formsets: