Django

Code

Changeset 5830

Show
Ignore:
Timestamp:
08/07/07 10:17:35 (1 year ago)
Author:
russellm
Message:

newforms-admin: Modified handling of request.POST and request.FILES to match the FileField? changes introduced to trunk in [5219], which were merged to newforms-admin in [5228]. File uploads on inline FormSets? will not be handled correctly.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/contrib/admin/options.py

    r5627 r5830  
    418418 
    419419        inline_formsets = [] 
    420         if request.POST: 
    421             new_data = request.POST.copy() 
    422             if opts.has_field_type(models.FileField): 
    423                 new_data.update(request.FILES) 
    424             form = ModelForm(new_data) 
     420        if request.method == 'POST': 
     421            form = ModelForm(request.POST, request.FILES) 
    425422            for FormSet in self.get_inline_formsets(): 
    426                 inline_formset = FormSet(data=new_data) 
     423                inline_formset = FormSet(data=request.POST) 
    427424                inline_formsets.append(inline_formset) 
    428425            if all_valid(inline_formsets) and form.is_valid(): 
    …… 
    471468 
    472469        inline_formsets = [] 
    473         if request.POST: 
    474             new_data = request.POST.copy() 
    475             if opts.has_field_type(models.FileField): 
    476                 new_data.update(request.FILES) 
    477             form = ModelForm(new_data) 
     470        if request.method == 'POST': 
     471            form = ModelForm(request.POST, request.FILES) 
    478472            for FormSet in self.get_inline_formsets(): 
    479                 inline_formset = FormSet(obj, new_data) 
     473                inline_formset = FormSet(obj, request.POST) 
    480474                inline_formsets.append(inline_formset) 
    481475