Django

Code

Changeset 9243

Show
Ignore:
Timestamp:
10/21/08 15:25:45 (3 months ago)
Author:
brosner
Message:

Display non_field_errors of inline forms in the admin. This was a presentation bug.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/helpers.py

    r8774 r9243  
    130130        self.show_url = original and hasattr(original, 'get_absolute_url') 
    131131        super(InlineAdminForm, self).__init__(form, fieldsets, prepopulated_fields) 
     132     
     133    def field_count(self): 
     134        # tabular.html uses this function for colspan value. 
     135        num_of_fields = 1 # always has at least one field 
     136        num_of_fields += len(self.fieldsets[0][1]["fields"]) 
     137        if self.formset.can_order: 
     138            num_of_fields += 1 
     139        if self.formset.can_delete: 
     140            num_of_fields += 1 
     141        return num_of_fields 
    132142 
    133143    def pk_field(self): 

  • django/trunk/django/contrib/admin/options.py

    r9086 r9243  
    586586                self.log_change(request, new_object, change_message) 
    587587                return self.response_change(request, new_object) 
     588                 
    588589        else: 
    589590            form = ModelForm(instance=obj) 
    …… 
    601602            inline_admin_formsets.append(inline_admin_formset) 
    602603            media = media + inline_admin_formset.media 
    603  
     604         
    604605        context = { 
    605606            'title': _('Change %s') % force_unicode(opts.verbose_name), 

  • django/trunk/django/contrib/admin/templates/admin/edit_inline/stacked.html

    r8587 r9243  
    1313  <p><a href="../../../r/{{ inline_admin_form.original.content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a></p> 
    1414  {% endif %} 
     15  {% if inline_admin_form.form.non_field_errors %}{{ inline_admin_form.form.non_field_errors }}{% endif %} 
    1516 
    1617  {% for fieldset in inline_admin_form %} 

  • django/trunk/django/contrib/admin/templates/admin/edit_inline/tabular.html

    r8984 r9243  
    1717    
    1818     {% for inline_admin_form in inline_admin_formset %} 
    19                     
     19        {% if inline_admin_form.form.non_field_errors %} 
     20        <tr><td colspan="{{ inline_admin_form.field_count }}">{{ inline_admin_form.form.non_field_errors }}</td></tr> 
     21        {% endif %} 
    2022        <tr class="{% cycle row1,row2 %} {% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}"> 
    2123