Changeset 8192

Timestamp:

08/02/08 00:29:17 (5 months ago)

Author:

gwilson

Message:

Fixed #8078 -- Fixed a Python 2.3 incompatibility in contrib/admin/options.py, thanks Karen Tracey.

Files:

• django/trunk/django/contrib/admin/options.py (modified) (12 diffs)

django/trunk/django/contrib/admin/options.py

@@ -15 +15 @@
-from django.utils.translation import ugettext as _
-from django.utils.encoding import force_unicode
-
+
+
+
+
-
-HORIZONTAL, VERTICAL = 1, 2
@@ -130 +133 @@
-        If kwargs are given, they're passed to the form Field's constructor.
-        """
-
+
-        # If the field specifies choices, we don't need to look for special
-        # admin widgets - we just need to use a select widget of some kind.
@@ -146 +149 @@
-                # Otherwise, use the default select widget.
-                return db_field.formfield(**kwargs)
-
+
-        # For DateTimeFields, use a special field and widget.
-        if isinstance(db_field, models.DateTimeField):
@@ -179 +182 @@
-            else:
-                if isinstance(db_field, models.ManyToManyField):
- 
+
-                    if db_field.rel.through is not None:
-                        return None
@@ -221 +224 @@
-    ordering = None
-    inlines = []
-
+
-    # Custom templates (designed to be over-ridden in subclasses)
-    change_form_template = None
@@ -272 +275 @@
-        if self.filter_vertical or self.filter_horizontal:
-            js.extend(['js/SelectBox.js' , 'js/SelectFilter2.js'])
-
+
-        return forms.Media(js=['%s%s' % (settings.ADMIN_MEDIA_PREFIX, url) for url in js])
-    media = property(_media)
@@ -389 +392 @@
-
-        `form` is a bound Form instance that's verified to be valid.
-
+
-        `formsets` is a sequence of InlineFormSet instances that are verified to be valid.
-        """
@@ -405 +408 @@
-        if form.changed_data:
-            change_message.append(_('Changed %s.') % get_text_list(form.changed_data, _('and')))
-
+
-        if formsets:
-            for formset in formsets:
-                for added_object in formset.new_objects:
- 
+
-                                          % {'name': added_object._meta.verbose_name,
-                                             'object': added_object})
-                for changed_object, changed_fields in formset.changed_objects:
- 
- 
- 
+
+
+
-                                             'object': changed_object})
-                for deleted_object in formset.deleted_objects:
- 
+
-                                          % {'name': deleted_object._meta.verbose_name,
-                                             'object': deleted_object})
@@ -609 +612 @@
-                return render_to_response('admin/invalid_setup.html', {'title': _('Database error')})
-            return HttpResponseRedirect(request.path + '?' + ERROR_FLAG + '=1')
-
+
-        context = {
-            'title': cl.title,
@@ -647 +650 @@
-        # will also be deleted.
-        deleted_objects = [mark_safe(u'%s: <a href="../../%s/">%s</a>' % (escape(force_unicode(capfirst(opts.verbose_name))), quote(object_id), escape(obj))), []]
-s.Set
+
-        get_deleted_objects(deleted_objects, perms_needed, request.user, obj, opts, 1, self.admin_site)
-
@@ -660 +663 @@
-                return HttpResponseRedirect("../../../../")
-            return HttpResponseRedirect("../../")
-
+
-        context = {
-            "title": _("Are you sure?"),
@@ -770 +773 @@
-        for field_name in flatten_fieldsets(self.fieldsets):
-            yield self.formset.form.base_fields[field_name]
-
+
-    def _media(self):
-        media = self.formset.media