Django

Code

Changeset 4338

Show
Ignore:
Timestamp:
01/15/07 19:05:25 (2 years ago)
Author:
adrian
Message:

newforms-admin: Moved save_on_top from AdminOptions? to ModelAdmin?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r4337 r4338  
    4242    date_hierarchy = None 
    4343    save_as = False 
     44    save_on_top = False 
    4445    ordering = None 
    4546 

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

    r4230 r4338  
    2727<div> 
    2828{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %} 
    29 {% if opts.admin.save_on_top %}{% submit_row %}{% endif %} 
     29{% if save_on_top %}{% submit_row %}{% endif %} 
    3030{% if form.error_dict %} 
    3131    <p class="errornote"> 

  • django/branches/newforms-admin/django/contrib/admin/views/main.py

    r4337 r4338  
    193193        'opts': opts, 
    194194        'content_type_id': ContentType.objects.get_for_model(model).id, 
     195        'save_on_top': opts.ModelAdmin.save_on_top, 
    195196    } 
    196197    context.update(extra_context) 

  • django/branches/newforms-admin/django/db/models/base.py

    r4337 r4338  
    138138            cls._meta.ModelAdmin = type('ModelAdmin', (value, ModelAdmin), {}) 
    139139            # This AdminOptions stuff is legacy and will eventually be removed. 
    140             value = AdminOptions(**dict([(k, v) for k, v in value.__dict__.items() if not k.startswith('_') and k not in ('list_display', 'list_display_links', 'list_filter', 'date_hierarchy', 'save_as', 'search_fields', 'list_select_related', 'list_per_page', 'ordering')])) 
     140            value = AdminOptions(**dict([(k, v) for k, v in value.__dict__.items() if not k.startswith('_') and k not in ('list_display', 'list_display_links', 'list_filter', 'date_hierarchy', 'save_as', 'search_fields', 'list_select_related', 'list_per_page', 'ordering', 'save_on_top')])) 
    141141            value.contribute_to_class(cls, name) 
    142142        elif hasattr(value, 'contribute_to_class'): 

  • django/branches/newforms-admin/django/db/models/options.py

    r4337 r4338  
    201201class AdminOptions(object): 
    202202    def __init__(self, fields=None, js=None, 
    203         save_on_top=False, manager=None): 
     203        manager=None): 
    204204        self.fields = fields 
    205205        self.js = js or [] 
    206         self.save_on_top = save_on_top 
    207206        self.manager = manager or Manager() 
    208207