mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 23:26:08 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Backwards-incompatible change: Refactored prepopulate_from. There's no longer a 'prepopulate_from' option on database Field classes. Instead, there's a new 'prepopulated_fields' option on the 'class Admin'. This should be a dictionary mapping field names (as strings) to lists/tuples of field names that prepopulate them

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty
2007-01-29 01:03:55 +00:00
parent 54d2c54425
commit 126c6cef52
5 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,8 +33,9 @@ def unquote(s):
return "".join(res)
class AdminForm(object):
def __init__(self, form, fieldsets):
def __init__(self, form, fieldsets, prepopulated_fields):
self.form, self.fieldsets = form, fieldsets
self.prepopulated_fields = [{'field': form[field_name], 'dependencies': [form[f] for f in dependencies]} for field_name, dependencies in prepopulated_fields.items()]
def __iter__(self):
for fieldset in self.fieldsets:
@@ -109,6 +110,7 @@ class ModelAdmin(object):
js = None
fields = None
raw_id_fields = ()
prepopulated_fields = {}
def __init__(self, model):
self.model = model
@@ -145,9 +147,8 @@ class ModelAdmin(object):
"""
from django.conf import settings
js = ['js/core.js', 'js/admin/RelatedObjectLookups.js']
# TODO: This.
#if auto_populated_fields:
#js.append('js/urlify.js')
if self.prepopulated_fields:
js.append('js/urlify.js')
if self.opts.has_field_type(models.DateTimeField) or self.opts.has_field_type(models.TimeField) or self.opts.has_field_type(models.DateField):
js.extend(['js/calendar.js', 'js/admin/DateTimeShortcuts.js'])
if self.opts.get_ordered_objects():
@@ -319,7 +320,7 @@ class ModelAdmin(object):
c = template.RequestContext(request, {
'title': _('Add %s') % opts.verbose_name,
'adminform': AdminForm(form, self.fieldsets_add(request)),
'adminform': AdminForm(form, self.fieldsets_add(request), self.prepopulated_fields),
'oldform': oldforms.FormWrapper(model.AddManipulator(), {}, {}),
'is_popup': request.REQUEST.has_key('_popup'),
'show_delete': False,
@@ -410,7 +411,7 @@ class ModelAdmin(object):
c = template.RequestContext(request, {
'title': _('Change %s') % opts.verbose_name,
'adminform': AdminForm(form, self.fieldsets_change(request, object_id)),
'adminform': AdminForm(form, self.fieldsets_change(request, object_id), self.prepopulated_fields),
'oldform': oldforms.FormWrapper(model.ChangeManipulator(object_id), {}, {}),
'object_id': object_id,
'original': obj,