Django

Code

Changeset 6029

Show
Ignore:
Timestamp:
08/31/07 00:43:21 (1 year ago)
Author:
russellm
Message:

newforms-admin: Made import visibility of formsets and Media consistent with that of fields, widgets and forms.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r6025 r6029  
    22from django import newforms as forms 
    33from django.newforms.formsets import all_valid 
    4 from django.newforms.models import inline_formset 
    5 from django.newforms.widgets import Media, MediaDefiningClass 
    64from django.contrib.admin import widgets 
    75from django.contrib.admin.util import get_deleted_objects 
    …… 
    6866        from django.conf import settings 
    6967        if 'collapse' in self.classes: 
    70             return Media(js=['%sjs/admin/CollapsedFieldsets.js' % settings.ADMIN_MEDIA_PREFIX]) 
    71         return Media() 
     68            return forms.Media(js=['%sjs/admin/CollapsedFieldsets.js' % settings.ADMIN_MEDIA_PREFIX]) 
     69        return forms.Media() 
    7270    media = property(_media) 
    7371     
    …… 
    166164class ModelAdmin(BaseModelAdmin): 
    167165    "Encapsulates all admin options and functionality for a given model." 
    168     __metaclass__ = MediaDefiningClass 
     166    __metaclass__ = forms.MediaDefiningClass 
    169167     
    170168    list_display = ('__str__',) 
    …… 
    221219            js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js']) 
    222220         
    223         return Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js]) 
     221        return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js]) 
    224222    media = property(_media) 
    225223     
    …… 
    614612        inline_formset_classes = [] 
    615613        for opts in self.inlines: 
    616             inline = inline_formset(self.model, opts.model, formfield_callback=opts.formfield_for_dbfield, fields=opts.fields, extra=opts.extra) 
     614            inline = forms.inline_formset(self.model, opts.model, formfield_callback=opts.formfield_for_dbfield, fields=opts.fields, extra=opts.extra) 
    617615            inline_formset_classes.append(inline) 
    618616        return inline_formset_classes 

  • django/branches/newforms-admin/django/newforms/formsets.py

    r5931 r6029  
    22from fields import IntegerField, BooleanField 
    33from widgets import HiddenInput, Media 
     4 
     5__all__ = ('BaseFormSet', 'formset_for_form', 'all_valid') 
    46 
    57# special field names 

  • django/branches/newforms-admin/django/newforms/__init__.py

    r4265 r6029  
    1616from forms import * 
    1717from models import * 
     18from formsets import * 

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

    r5833 r6029  
    1616__all__ = ( 
    1717    'save_instance', 'form_for_model', 'form_for_instance', 'form_for_fields', 
    18     'ModelChoiceField', 'ModelMultipleChoiceField' 
     18    'ModelChoiceField', 'ModelMultipleChoiceField', 'inline_formset' 
    1919) 
    2020 

  • django/branches/newforms-admin/django/newforms/widgets.py

    r5986 r6029  
    1818 
    1919__all__ = ( 
    20     'Media', 'Widget', 'TextInput', 'PasswordInput', 
     20    'Media', 'MediaDefiningClass', 'Widget', 'TextInput', 'PasswordInput', 
    2121    'HiddenInput', 'MultipleHiddenInput', 
    2222    'FileInput', 'Textarea', 'CheckboxInput',