mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Simplified admin.views.main.get_javascript_imports()

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2084 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-01-21 04:10:46 +00:00
parent d6629224c3
commit cdb7a51098
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/admin/views/main.py
View File

@ -50,14 +50,14 @@ def get_model(app_label, model_name):
return model return model
raise Http404, "App %r, model %r, not found" % (app_label, model_name) raise Http404, "App %r, model %r, not found" % (app_label, model_name)
def get_javascript_imports(opts, auto_populated_fields, ordered_objects, field_sets): def get_javascript_imports(opts, auto_populated_fields, field_sets):
# Put in any necessary JavaScript imports. # Put in any necessary JavaScript imports.
js = ['js/core.js', 'js/admin/RelatedObjectLookups.js'] js = ['js/core.js', 'js/admin/RelatedObjectLookups.js']
if auto_populated_fields: if auto_populated_fields:
js.append('js/urlify.js') js.append('js/urlify.js')
if opts.has_field_type(models.DateTimeField) or opts.has_field_type(models.TimeField) or opts.has_field_type(models.DateField): if opts.has_field_type(models.DateTimeField) or opts.has_field_type(models.TimeField) or opts.has_field_type(models.DateField):
js.extend(['js/calendar.js', 'js/admin/DateTimeShortcuts.js']) js.extend(['js/calendar.js', 'js/admin/DateTimeShortcuts.js'])
if ordered_objects: if opts.get_ordered_objects():
js.extend(['js/getElementsBySelector.js', 'js/dom-drag.js' , 'js/admin/ordering.js']) js.extend(['js/getElementsBySelector.js', 'js/dom-drag.js' , 'js/admin/ordering.js'])
if opts.admin.js: if opts.admin.js:
js.extend(opts.admin.js) js.extend(opts.admin.js)
@ -152,7 +152,7 @@ class AdminBoundManipulator(BoundManipulator):
field_sets = self.opts.admin.get_field_sets(self.opts) field_sets = self.opts.admin.get_field_sets(self.opts)
self.auto_populated_fields = [f for f in self.opts.fields if f.prepopulate_from] self.auto_populated_fields = [f for f in self.opts.fields if f.prepopulate_from]
self.javascript_imports = get_javascript_imports(self.opts, self.auto_populated_fields, self.ordered_objects, field_sets); self.javascript_imports = get_javascript_imports(self.opts, self.auto_populated_fields, field_sets);
self.coltype = self.ordered_objects and 'colMS' or 'colM' self.coltype = self.ordered_objects and 'colMS' or 'colM'
self.has_absolute_url = hasattr(model, 'get_absolute_url') self.has_absolute_url = hasattr(model, 'get_absolute_url')
self.form_enc_attrib = self.opts.has_field_type(models.FileField) and 'enctype="multipart/form-data" ' or '' self.form_enc_attrib = self.opts.has_field_type(models.FileField) and 'enctype="multipart/form-data" ' or ''