Django

Code

Changeset 4333

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

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r4332 r4333  
    3838    list_filter = () 
    3939    date_hierarchy = None 
     40    save_as = False 
    4041 
    4142    def __init__(self, model): 

  • django/branches/newforms-admin/django/contrib/admin/templatetags/admin_modify.py

    r4265 r4333  
    4242        'show_delete_link': (not is_popup and context['has_delete_permission'] 
    4343                              and (change or context['show_delete'])), 
    44         'show_save_as_new': not is_popup and change and opts.admin.save_as, 
    45         'show_save_and_add_another': not is_popup and (not opts.admin.save_as or context['add']), 
     44        'show_save_as_new': not is_popup and change and opts.ModelAdmin.save_as, 
     45        'show_save_and_add_another': not is_popup and (not opts.ModelAdmin.save_as or context['add']), 
    4646        'show_save_and_continue': not is_popup and context['has_change_permission'], 
    4747        'show_save': True 

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

    r4332 r4333  
    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')])) 
     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')])) 
    141141            value.contribute_to_class(cls, name) 
    142142        elif hasattr(value, 'contribute_to_class'): 

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

    r4332 r4333  
    201201class AdminOptions(object): 
    202202    def __init__(self, fields=None, js=None, 
    203         save_as=False, ordering=None, search_fields=None, 
     203        ordering=None, search_fields=None, 
    204204        save_on_top=False, list_select_related=False, manager=None, list_per_page=100): 
    205205        self.fields = fields 
    206206        self.js = js or [] 
    207         self.save_as, self.ordering = save_as, ordering 
     207        self.ordering = ordering 
    208208        self.search_fields = search_fields or [] 
    209209        self.save_on_top = save_on_top