mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Fixed #5383.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Joseph Kocherhans 2007-09-12 01:34:25 +00:00
parent 3d85b2748d
commit addbe83dcc
1 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
django/contrib/admin/options.py
View File

@ -179,22 +179,21 @@ class BaseModelAdmin(object):
# For any other type of field, just call its formfield() method. # For any other type of field, just call its formfield() method.
return db_field.formfield(**kwargs) return db_field.formfield(**kwargs)
def _fieldsets(self, request): def _declared_fieldsets(self):
if self.fieldsets: if self.fieldsets:
return self.fieldsets return self.fieldsets
if self.fields: elif self.fields:
return [(None, {'fields': self.fields})] return [(None, {'fields': self.fields})]
# TODO: switch this to pull from the form, not the model return None
fields = [f.name for f in self.opts.fields + self.opts.many_to_many if f.editable and not isinstance(f, models.AutoField)] declared_fieldsets = property(_declared_fieldsets)
return [(None, {'fields': fields})]
def fieldsets_add(self, request): def fieldsets_add(self, request):
"Hook for specifying fieldsets for the add form." "Hook for specifying fieldsets for the add form."
return list(self._fieldsets(request)) raise NotImplementedError
def fieldsets_change(self, request, obj): def fieldsets_change(self, request, obj):
"Hook for specifying fieldsets for the change form." "Hook for specifying fieldsets for the change form."
return list(self._fieldsets(request)) raise NotImplementedError
class ModelAdmin(BaseModelAdmin): class ModelAdmin(BaseModelAdmin):
"Encapsulates all admin options and functionality for a given model." "Encapsulates all admin options and functionality for a given model."
@ -309,18 +308,38 @@ class ModelAdmin(BaseModelAdmin):
""" """
return self.queryset(request) return self.queryset(request)
def fieldsets_add(self, request):
"Hook for specifying fieldsets for the add form."
if self.declared_fieldsets:
return self.declared_fieldsets
form = self.form_add(request)
return [(None, {'fields': form.base_fields.keys()})]
def fieldsets_change(self, request, obj):
"Hook for specifying fieldsets for the change form."
if self.declared_fieldsets:
return self.declared_fieldsets
form = self.form_change(request, obj)
return [(None, {'fields': form.base_fields.keys()})]
def form_add(self, request): def form_add(self, request):
""" """
Returns a Form class for use in the admin add view. Returns a Form class for use in the admin add view.
""" """
fields = flatten_fieldsets(self.fieldsets_add(request)) if self.declared_fieldsets:
fields = flatten_fieldsets(self.declared_fieldsets)
else:
fields = None
return forms.form_for_model(self.model, fields=fields, formfield_callback=self.formfield_for_dbfield) return forms.form_for_model(self.model, fields=fields, formfield_callback=self.formfield_for_dbfield)
def form_change(self, request, obj): def form_change(self, request, obj):
""" """
Returns a Form class for use in the admin change view. Returns a Form class for use in the admin change view.
""" """
fields = flatten_fieldsets(self.fieldsets_change(request, obj)) if self.declared_fieldsets:
fields = flatten_fieldsets(self.declared_fieldsets)
else:
fields = None
return forms.form_for_instance(obj, fields=fields, formfield_callback=self.formfield_for_dbfield) return forms.form_for_instance(obj, fields=fields, formfield_callback=self.formfield_for_dbfield)
def save_add(self, request, model, form, formsets, post_url_continue): def save_add(self, request, model, form, formsets, post_url_continue):
@ -678,21 +697,31 @@ class InlineModelAdmin(BaseModelAdmin):
def formset_add(self, request): def formset_add(self, request):
"""Returns an InlineFormSet class for use in admin add views.""" """Returns an InlineFormSet class for use in admin add views."""
fields = flatten_fieldsets(self.fieldsets_add(request)) if self.declared_fieldsets:
fields = flatten_fieldsets(self.declared_fieldsets)
else:
fields = None
return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra) return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra)
def formset_change(self, request, obj): def formset_change(self, request, obj):
"""Returns an InlineFormSet class for use in admin change views.""" """Returns an InlineFormSet class for use in admin change views."""
fields = flatten_fieldsets(self.fieldsets_change(request, obj)) if self.declared_fieldsets:
fields = flatten_fieldsets(self.declared_fieldsets)
else:
fields = None
return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra) return forms.inline_formset(self.parent_model, self.model, fk_name=self.fk_name, fields=fields, formfield_callback=self.formfield_for_dbfield, extra=self.extra)
def _fieldsets(self, request): def fieldsets_add(self, request):
if self.fieldsets: if self.declared_fieldsets:
return self.fieldsets return self.declared_fieldsets
if self.fields: form = self.formset_add(request).form_class
return [(None, {'fields': self.fields})] return [(None, {'fields': form.base_fields.keys()})]
fields = [f for f in self.formset_class(request).form_class.base_fields.keys()]
return [(None, {'fields': fields})] def fieldsets_change(self, request, obj):
if self.declared_fieldsets:
return self.declared_fieldsets
form = self.formset_change(request, obj).form_class
return [(None, {'fields': form.base_fields.keys()})]
class StackedInline(InlineModelAdmin): class StackedInline(InlineModelAdmin):
template = 'admin/edit_inline_stacked.html' template = 'admin/edit_inline_stacked.html'