Django

Code

Changeset 6107

Show
Ignore:
Timestamp:
09/11/07 22:13:30 (1 year ago)
Author:
jkocherhans
Message:

newforms-admin: Changed inline model admin back to using verbose_name/verbose_name_plural. We may need both in the templates.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r6105 r6107  
    688688    extra = 3 
    689689    template = None 
    690     label = None 
     690    verbose_name = None 
     691    verbose_name_plural = None 
    691692 
    692693    def __init__(self, parent_model, admin_site): 
    …… 
    695696        self.opts = self.model._meta 
    696697        super(InlineModelAdmin, self).__init__() 
     698        if self.verbose_name is None: 
     699            self.verbose_name = self.model._meta.verbose_name 
     700        if self.verbose_name_plural is None: 
     701            self.verbose_name_plural = self.model._meta.verbose_name_plural 
    697702 
    698703    def formset_add(self, request): 
    …… 
    727732    template = 'admin/edit_inline_stacked.html' 
    728733 
    729     def get_label(self): 
    730         return self.label or self.model._meta.verbose_name 
    731  
    732734class TabularInline(InlineModelAdmin): 
    733735    template = 'admin/edit_inline_tabular.html' 
    734  
    735     def get_label(self): 
    736         return self.label or self.model._meta.verbose_name_plural 
    737736 
    738737class InlineAdminFormSet(object): 

  • django/branches/newforms-admin/django/contrib/admin/templates/admin/edit_inline_stacked.html

    r6072 r6107  
    22{% for inline_admin_form in inline_admin_formset %} 
    33<fieldset class="module aligned {{ bfset.fieldset.classes }}"> 
    4   <h2>{{ inline_admin_formset.opts.get_label|title }}&nbsp;#{{ forloop.counter }}</h2> 
     4  <h2>{{ inline_admin_formset.opts.verbose_name|title }}&nbsp;#{{ forloop.counter }}</h2> 
    55  {% for bfset in inline_admin_form %} 
    66    <!-- fieldsets, headers, and descriptions are commented out until we have decent styles for them --> 

  • django/branches/newforms-admin/django/contrib/admin/templates/admin/edit_inline_tabular.html

    r6101 r6107  
    22{{ inline_admin_formset.formset.management_form }} 
    33<fieldset class="module"> 
    4    <h2>{{ inline_admin_formset.opts.get_label|capfirst|escape }}</h2> 
     4   <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst|escape }}</h2> 
    55   <table> 
    66     <thead><tr>