Ticket #1083: admin.diff

django/contrib/admin/templatetags/admin_list.py

@@ -82 +82 @@
             if field_name == '__repr__':
                 header = lookup_opts.verbose_name
             else:
-                func = getattr(cl.mod.Klass, field_name) # Let AttributeErrors propogate.
+                func = getattr(cl.model, field_name) # Let AttributeErrors propogate.
                 try:
                     header = func.short_description
                 except AttributeError:

django/contrib/admin/views/main.py

@@ -559 +559 @@
     if not request.user.has_perm(app_label + '.' + opts.get_change_permission()):
         raise PermissionDenied
     if request.POST and request.POST.has_key("_saveasnew"):
-        return add_stage(request, path, form_url='../add/')
+        return add_stage(request, path, form_url='../../add/')
     try:
         manipulator_class = model.ChangeManipulator
         manipulator = manipulator_class(object_id)
@@ -587 +587 @@
                     return HttpResponseRedirect(request.path)
             elif request.POST.has_key("_saveasnew"):
                 request.user.add_message(_('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % {'name': opts.verbose_name, 'obj': new_object})
-                return HttpResponseRedirect("../%s/" % pk_value)
+                return HttpResponseRedirect("../../%s/" % pk_value)
             elif request.POST.has_key("_addanother"):
                 request.user.add_message(msg + ' ' + (_("You may add another %s below.") % opts.verbose_name))
-                return HttpResponseRedirect("../add/")
+                return HttpResponseRedirect("../../add/")
             else:
                 request.user.add_message(msg)
-                return HttpResponseRedirect("../")
+                return HttpResponseRedirect("../../")
     else:
         # Populate new_data with a "flattened" version of the current data.
         new_data = manipulator.flatten_data()