Author: adrian
Date: 2007-01-16 19:44:00 -0600 (Tue, 16 Jan 2007)
New Revision: 4340
Modified:
django/branches/newforms-admin/django/contrib/admin/options.py
django/branches/newforms-admin/django/contrib/admin/views/main.py
django/branches/newforms-admin/django/db/models/options.py
Log:
newforms-admin: Moved js from AdminOptions to ModelAdmin.
Modified: django/branches/newforms-admin/django/contrib/admin/options.py
===================================================================
--- django/branches/newforms-admin/django/contrib/admin/options.py
2007-01-16 17:01:55 UTC (rev 4339)
+++ django/branches/newforms-admin/django/contrib/admin/options.py
2007-01-17 01:44:00 UTC (rev 4340)
@@ -43,6 +43,7 @@
save_as = False
save_on_top = False
ordering = None
+ js = None
def __init__(self, model):
self.model = model
Modified: django/branches/newforms-admin/django/contrib/admin/views/main.py
===================================================================
--- django/branches/newforms-admin/django/contrib/admin/views/main.py
2007-01-16 17:01:55 UTC (rev 4339)
+++ django/branches/newforms-admin/django/contrib/admin/views/main.py
2007-01-17 01:44:00 UTC (rev 4340)
@@ -57,8 +57,8 @@
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:
Modified: django/branches/newforms-admin/django/db/models/options.py
===================================================================
--- django/branches/newforms-admin/django/db/models/options.py 2007-01-16
17:01:55 UTC (rev 4339)
+++ django/branches/newforms-admin/django/db/models/options.py 2007-01-17
01:44:00 UTC (rev 4340)
@@ -199,10 +199,8 @@
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):
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Django
updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
