Ticket #7982: ticket7982against8487.diff

django/contrib/admin/options.py

@@ -180 +180 @@
     def __call__(self, request, url):
         # Delegate to the appropriate method, based on the URL.
         if url is None:
-            return self.changelist_view(request)
+            return HttpResponseRedirect("objects/")
+        elif url.startswith('objects'):
+            if url.endswith('objects'):
+                return self.changelist_view(request)
+            elif len(url.split("/")) == 3 and url.endswith('history'):
+                return self.history_view(request, unquote(url[8:-8]))
+            elif len(url.split("/")) == 3 and url.endswith('delete'):
+                return self.delete_view(request, unquote(url[8:-7]))
+            else:
+                return self.change_view(request, unquote(url[8:]))
         elif url.endswith('add'):
             return self.add_view(request)
-        elif url.endswith('history'):
-            return self.history_view(request, unquote(url[:-8]))
-        elif url.endswith('delete'):
-            return self.delete_view(request, unquote(url[:-7]))
         else:
-            return self.change_view(request, unquote(url))
+            return Http404("There is currently no view assigned to that address") #TODO: Replace me with something better
 
+
     def _media(self):
         from django.conf import settings
 
@@ -398 +404 @@
             "admin/change_form.html"
         ], context, context_instance=template.RequestContext(request))
     
-    def response_add(self, request, obj, post_url_continue='../%s/'):
+    def response_add(self, request, obj, post_url_continue='../objects/%s/'):
         """
         Determines the HttpResponse for the add_view stage.
         """
@@ -409 +415 @@
         # Here, we distinguish between different save types by checking for
         # the presence of keys in request.POST.
         if request.POST.has_key("_continue"):
+            print pk_value
+            print escape(pk_value)
+            print force_unicode(pk_value)
             self.message_user(request, msg + ' ' + _("You may edit it again below."))
             if request.POST.has_key("_popup"):
                 post_url_continue += "?_popup=1"
-            return HttpResponseRedirect(post_url_continue % pk_value)
+            return HttpResponseRedirect(post_url_continue % escape(pk_value))
         
         if request.POST.has_key("_popup"):
             return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \
@@ -420 +429 @@
                 (escape(pk_value), escape(obj)))
         elif request.POST.has_key("_addanother"):
             self.message_user(request, msg + ' ' + (_("You may add another %s below.") % force_unicode(opts.verbose_name)))
-            return HttpResponseRedirect(request.path)
+            return HttpResponseRedirect(request.path) #TODO: Fix this when save and add from an existing object
         else:
             self.message_user(request, msg)
 

django/contrib/admin/templates/admin/change_list.html

@@ -5 +5 @@
 
 {% block bodyclass %}change-list{% endblock %}
 
-{% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans "Home" %}</a> &rsaquo; <a href="../">{{ app_label|capfirst|escape }}</a> &rsaquo; {{ cl.opts.verbose_name_plural|capfirst|escape }}</div>{% endblock %}{% endif %}
+{% if not is_popup %}{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../../">{% trans "Home" %}</a> &rsaquo; <a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo; {{ cl.opts.verbose_name_plural|capfirst|escape }} </div>{% endblock %}{% endif %}
 
 {% block coltype %}flex{% endblock %}
 
@@ -13 +13 @@
 <div id="content-main">
 {% block object-tools %}
 {% if has_add_permission %}
-<ul class="object-tools"><li><a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">{% blocktrans with cl.opts.verbose_name|escape as name %}Add {{ name }}{% endblocktrans %}</a></li></ul>
+<ul class="object-tools"><li><a href="../add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">{% blocktrans with cl.opts.verbose_name|escape as name %}Add {{ name }}{% endblocktrans %}</a></li></ul>
 {% endif %}
 {% endblock %}
 <div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">