Changeset 4343

Timestamp:

01/16/07 23:39:29 (1 year ago)

Author:

adrian

Message:

newforms-admin: Finished migrating AdminOptions? to ModelForm?. AdminOptions? no longer exists. Things are still a bit messy.

Files:

• django/branches/newforms-admin/django/contrib/admin/options.py (modified) (5 diffs)
• django/branches/newforms-admin/django/contrib/admin/templatetags/admin_modify.py (modified) (1 diff)
• django/branches/newforms-admin/django/contrib/admin/views/main.py (modified) (6 diffs)
• django/branches/newforms-admin/django/core/management.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/models/base.py (modified) (2 diffs)
• django/branches/newforms-admin/django/db/models/__init__.py (modified) (1 diff)
• django/branches/newforms-admin/django/db/models/options.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/invalid_admin_options/models.py (modified) (1 diff)

django/branches/newforms-admin/django/contrib/admin/options.py

@@ -31 +31 @@
-    return "".join(res)
-
+class AdminFieldSet(object):
+    def __init__(self, name, classes, field_locator_func, line_specs, description):
+        self.name = name
+        self.field_lines = [AdminFieldLine(field_locator_func, line_spec) for line_spec in line_specs]
+        self.classes = classes
+        self.description = description
+
+    def __repr__(self):
+        return "FieldSet: (%s, %s)" % (self.name, self.field_lines)
+
+    def bind(self, field_mapping, original, bound_field_set_class):
+        return bound_field_set_class(self, field_mapping, original)
+
+    def __iter__(self):
+        for field_line in self.field_lines:
+            yield field_line
+
+    def __len__(self):
+        return len(self.field_lines)
+
+class AdminFieldLine(object):
+    def __init__(self, field_locator_func, linespec):
+        if isinstance(linespec, basestring):
+            self.fields = [field_locator_func(linespec)]
+        else:
+            self.fields = [field_locator_func(field_name) for field_name in linespec]
+
+    def bind(self, field_mapping, original, bound_field_line_class):
+        return bound_field_line_class(self, field_mapping, original)
+
+    def __iter__(self):
+        for field in self.fields:
+            yield field
+
+    def __len__(self):
+        return len(self.fields)
+
-class ModelAdmin(object):
-    "Encapsulates all admin options and functionality for a given model."
@@ -45 +82 @@
-    ordering = None
-    js = None
+    fields = None
-
-    def __init__(self, model):
@@ -74 +112 @@
-        else:
-            return self.change_view(request, unquote(url))
+
+    def get_field_sets(self, opts):
+        "Returns a list of AdminFieldSet objects."
+        if self.fields is None:
+            field_struct = ((None, {'fields': [f.name for f in opts.fields + opts.many_to_many if f.editable and not isinstance(f, models.AutoField)]}),)
+        else:
+            field_struct = self.fields
+        new_fieldset_list = []
+        for fieldset in field_struct:
+            fs_options = fieldset[1]
+            classes = fs_options.get('classes', ())
+            description = fs_options.get('description', '')
+            new_fieldset_list.append(AdminFieldSet(fieldset[0], classes,
+                opts.get_field, fs_options['fields'], description))
+        return new_fieldset_list
-
-    def has_add_permission(self, request):
@@ -174 +227 @@
-            c['object_id'] = object_id_override
-
-
+self, 
-
-    def change_view(self, request, object_id):
@@ -273 +326 @@
-            'is_popup': request.REQUEST.has_key('_popup'),
-        })
-
+self, 
-
-    def change_list_view(self, request):

django/branches/newforms-admin/django/contrib/admin/templatetags/admin_modify.py

@@ -42 +42 @@
-        'show_delete_link': (not is_popup and context['has_delete_permission']
-                              and (change or context['show_delete'])),
-ModelA
-ModelA
+a
+a
-        'show_save_and_continue': not is_popup and context['has_change_permission'],
-        'show_save': True

django/branches/newforms-admin/django/contrib/admin/views/main.py

@@ -58 +58 @@
-    if opts.get_ordered_objects():
-        js.extend(['js/getElementsBySelector.js', 'js/dom-drag.js' , 'js/admin/ordering.js'])
-ModelA
-ModelA
+a
+a
-    seen_collapse = False
-    for field_set in field_sets:
@@ -82 +82 @@
-    if not model._meta.admin:
-        raise Http404("This object has no admin interface.")
-ModelA
+a
-    return mav(request, rest_of_url)
-model_admin_view = staff_member_required(never_cache(model_admin_view))
@@ -167 +167 @@
-        return len(self.bound_field_lines)
-
-
+_admin, model
-    opts = model._meta
-    app_label = opts.app_label
-    auto_populated_fields = [f for f in opts.fields if f.prepopulate_from]
-opts.
+model_
-    original = getattr(manipulator, 'original_object', None)
-    bound_field_sets = [field_set.bind(context['form'], original, AdminBoundFieldSet) for field_set in field_sets]
@@ -193 +193 @@
-        'opts': opts,
-        'content_type_id': ContentType.objects.get_for_model(model).id,
-opts.ModelA
+model_a
-    }
-    context.update(extra_context)
@@ -306 +306 @@
-        self.list_select_related = list_select_related
-        self.list_per_page = list_per_page
+        self.model_admin = model_admin
-
-        # Get search parameters from the query string.
@@ -400 +401 @@
-        # order descending by ID by default. Finally, look for manually-specified
-        # ordering from the query string.
-lookup_opts.ModelA
+self.model_a
-
-        # Normalize it to new-style ordering.

django/branches/newforms-admin/django/core/management.py

@@ -980 +980 @@
-        # Check admin attribute.
-        if opts.admin is not None:
-
-
+
+
+
-            else:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                    try:
-opts.ModelAdmin.date_hierarchy
+fn
-                    except models.FieldDoesNotExist:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        # Check ordering attribute.

django/branches/newforms-admin/django/db/models/base.py

@@ -6 +6 @@
-from django.db.models.fields.related import OneToOneRel, ManyToOneRel
-from django.db.models.query import delete_objects
-, AdminOptions
+
-from django.db import connection, backend, transaction
-from django.db.models import signals
@@ -136 +136 @@
-            # resulting class is same as if the 'class Admin' were a subclass
-            # of ModelAdmin.
-
-
-
-
+
-        elif hasattr(value, 'contribute_to_class'):
-            value.contribute_to_class(cls, name)

django/branches/newforms-admin/django/db/models/__init__.py

@@ -6 +6 @@
-from django.db.models.query import Q
-from django.db.models.manager import Manager
-, AdminOptions
+
-from django.db.models.fields import *
-from django.db.models.fields.related import ForeignKey, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel, TABULAR, STACKED

django/branches/newforms-admin/django/db/models/options.py

@@ -197 +197 @@
-                self._field_types[field_type] = False
-        return self._field_types[field_type]
-
-class AdminOptions(object):
-    def __init__(self, fields=None):
-        self.fields = fields
-
-    def get_field_sets(self, opts):
-        "Returns a list of AdminFieldSet objects for this AdminOptions object."
-        if self.fields is None:
-            field_struct = ((None, {'fields': [f.name for f in opts.fields + opts.many_to_many if f.editable and not isinstance(f, AutoField)]}),)
-        else:
-            field_struct = self.fields
-        new_fieldset_list = []
-        for fieldset in field_struct:
-            fs_options = fieldset[1]
-            classes = fs_options.get('classes', ())
-            description = fs_options.get('description', '')
-            new_fieldset_list.append(AdminFieldSet(fieldset[0], classes,
-                opts.get_field, fs_options['fields'], description))
-        return new_fieldset_list
-
-    def contribute_to_class(self, cls, name):
-        cls._meta.admin = self
-
-class AdminFieldSet(object):
-    def __init__(self, name, classes, field_locator_func, line_specs, description):
-        self.name = name
-        self.field_lines = [AdminFieldLine(field_locator_func, line_spec) for line_spec in line_specs]
-        self.classes = classes
-        self.description = description
-
-    def __repr__(self):
-        return "FieldSet: (%s, %s)" % (self.name, self.field_lines)
-
-    def bind(self, field_mapping, original, bound_field_set_class):
-        return bound_field_set_class(self, field_mapping, original)
-
-    def __iter__(self):
-        for field_line in self.field_lines:
-            yield field_line
-
-    def __len__(self):
-        return len(self.field_lines)
-
-class AdminFieldLine(object):
-    def __init__(self, field_locator_func, linespec):
-        if isinstance(linespec, basestring):
-            self.fields = [field_locator_func(linespec)]
-        else:
-            self.fields = [field_locator_func(field_name) for field_name in linespec]
-
-    def bind(self, field_mapping, original, bound_field_line_class):
-        return bound_field_line_class(self, field_mapping, original)
-
-    def __iter__(self):
-        for field in self.fields:
-            yield field
-
-    def __len__(self):
-        return len(self.fields)

django/branches/newforms-admin/tests/regressiontests/invalid_admin_options/models.py

@@ -9 +9 @@
-model_errors = ""
-
-# TODO: Invalid admin options should not cause a metaclass error
-##This should fail gracefully but is causing a metaclass error
-#class BadAdminOption(models.Model):
-#    "Test nonexistent admin option"
-#    name = models.CharField(maxlength=30)
-#    
-#    class Admin:
-#        nonexistent = 'option'
-#
-#model_errors += """invalid_admin_options.badadminoption: "admin" attribute, if given, must be set to a models.AdminOptions() instance.
-#"""
-        
-class ListDisplayBadOne(models.Model):
-    "Test list_display, list_display must be a list or tuple"