diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2007-01-17 01:44:00 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2007-01-17 01:44:00 +0000 |
| commit | 626e6d4eb98602488a9f4826a22638dfc8d3915c (patch) | |
| tree | a56657c01ce86161a2294d5be5bc9d1f35e8e84e | |
| parent | a2b25f721691d98f0ee23e4e65e9797499eddfe1 (diff) | |
newforms-admin: Moved js from AdminOptions to ModelAdmin.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/options.py | 1 | ||||
| -rw-r--r-- | django/contrib/admin/views/main.py | 4 | ||||
| -rw-r--r-- | django/db/models/options.py | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index f3b7701d75..e210729a2c 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -43,6 +43,7 @@ class ModelAdmin(object): save_as = False save_on_top = False ordering = None + js = None def __init__(self, model): self.model = model diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 7cb73711e6..807dbd4ba1 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -57,8 +57,8 @@ def get_javascript_imports(opts, auto_populated_fields, field_sets): js.extend(['js/calendar.js', 'js/admin/DateTimeShortcuts.js']) if opts.get_ordered_objects(): js.extend(['js/getElementsBySelector.js', 'js/dom-drag.js' , 'js/admin/ordering.js']) - if opts.admin.js: - js.extend(opts.admin.js) + if opts.ModelAdmin.js: + js.extend(opts.ModelAdmin.js) seen_collapse = False for field_set in field_sets: if not seen_collapse and 'collapse' in field_set.classes: diff --git a/django/db/models/options.py b/django/db/models/options.py index 3202734825..1aff761666 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -199,10 +199,8 @@ class Options(object): return self._field_types[field_type] class AdminOptions(object): - def __init__(self, fields=None, js=None, - manager=None): + def __init__(self, fields=None, manager=None): self.fields = fields - self.js = js or [] self.manager = manager or Manager() def get_field_sets(self, opts): |