Commit aaf77c16 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Converted internal link generation in the admin and admin document generator to use named URLs. 

Thanks to Florian Apolloner for both the initial patch and his final push to get
this fixed, to Dario Ocles for his great work on the admin templates and
switching the admin_doc application to also use named URLs, to Mikko Hellsing
for his comments and to Jannis and Julien for their review and design guidance.

Fixes #15294.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 7b21bfc0

django/contrib/admin/options.py

+32 −10
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ from django.contrib import messages 
from django.views.decorators.csrf import csrf_protect

from django.core.exceptions import PermissionDenied, ValidationError

from django.core.paginator import Paginator

from django.core.urlresolvers import reverse

from django.db import models, transaction, router

from django.db.models.related import RelatedObject

from django.db.models.fields import BLANK_CHOICE_DASH, FieldDoesNotExist
@@ -776,9 +777,12 @@ class ModelAdmin(BaseModelAdmin): 
            # redirect to the change-list page for this object. Otherwise,

            # redirect to the admin index.

            if self.has_change_permission(request, None):

                post_url = '../'

                post_url = reverse('admin:%s_%s_changelist' %

                                   (opts.app_label, opts.module_name),

                                   current_app=self.admin_site.name)

            else:

                post_url = '../../../'

                post_url = reverse('admin:index',

                                   current_app=self.admin_site.name)

            return HttpResponseRedirect(post_url)



    def response_change(self, request, obj):
@@ -787,11 +791,14 @@ class ModelAdmin(BaseModelAdmin): 
        """

        opts = obj._meta



        # Handle proxy models automatically created by .only() or .defer()

        # Handle proxy models automatically created by .only() or .defer().

        # Refs #14529

        verbose_name = opts.verbose_name

        module_name = opts.module_name

        if obj._deferred:

            opts_ = opts.proxy_for_model._meta

            verbose_name = opts_.verbose_name

            module_name = opts_.module_name



        pk_value = obj._get_pk_val()
@@ -805,19 +812,28 @@ class ModelAdmin(BaseModelAdmin): 
        elif "_saveasnew" in request.POST:

            msg = _('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % {'name': force_unicode(verbose_name), 'obj': obj}

            self.message_user(request, msg)

            return HttpResponseRedirect("../%s/" % pk_value)

            return HttpResponseRedirect(reverse('admin:%s_%s_change' %

                                        (opts.app_label, module_name),

                                        args=(pk_value,),

                                        current_app=self.admin_site.name))

        elif "_addanother" in request.POST:

            self.message_user(request, msg + ' ' + (_("You may add another %s below.") % force_unicode(verbose_name)))

            return HttpResponseRedirect("../add/")

            return HttpResponseRedirect(reverse('admin:%s_%s_add' %

                                        (opts.app_label, module_name),

                                        current_app=self.admin_site.name))

        else:

            self.message_user(request, msg)

            # Figure out where to redirect. If the user has change permission,

            # redirect to the change-list page for this object. Otherwise,

            # redirect to the admin index.

            if self.has_change_permission(request, None):

                return HttpResponseRedirect('../')

                post_url = reverse('admin:%s_%s_changelist' %

                                   (opts.app_label, module_name),

                                   current_app=self.admin_site.name)

            else:

                return HttpResponseRedirect('../../../')

                post_url = reverse('admin:index',

                                   current_app=self.admin_site.name)

            return HttpResponseRedirect(post_url)



    def response_action(self, request, queryset):

        """
@@ -990,7 +1006,9 @@ class ModelAdmin(BaseModelAdmin): 
            raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_unicode(opts.verbose_name), 'key': escape(object_id)})



        if request.method == 'POST' and "_saveasnew" in request.POST:

            return self.add_view(request, form_url='../add/')

            return self.add_view(request, form_url=reverse('admin:%s_%s_add' %

                                    (opts.app_label, opts.module_name),

                                    current_app=self.admin_site.name))



        ModelForm = self.get_form(request, obj)

        formsets = []
@@ -1246,8 +1264,11 @@ class ModelAdmin(BaseModelAdmin): 
            self.message_user(request, _('The %(name)s "%(obj)s" was deleted successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': force_unicode(obj_display)})



            if not self.has_change_permission(request, None):

                return HttpResponseRedirect("../../../../")

            return HttpResponseRedirect("../../")

                return HttpResponseRedirect(reverse('admin:index',

                                                    current_app=self.admin_site.name))

            return HttpResponseRedirect(reverse('admin:%s_%s_changelist' %

                                        (opts.app_label, opts.module_name),

                                        current_app=self.admin_site.name))



        object_name = force_unicode(opts.verbose_name)
@@ -1292,6 +1313,7 @@ class ModelAdmin(BaseModelAdmin): 
            'module_name': capfirst(force_unicode(opts.verbose_name_plural)),

            'object': obj,

            'app_label': app_label,

            'opts': opts,

        }

        context.update(extra_context or {})

        return TemplateResponse(request, self.object_history_template or [

django/contrib/admin/sites.py

+7 −3
Original line number Diff line number Diff line
@@ -339,9 +339,11 @@ class AdminSite(object): 
                # Check whether user has any perm for this module.

                # If so, add the module to the model_list.

                if True in perms.values():

                    info = (app_label, model._meta.module_name)

                    model_dict = {

                        'name': capfirst(model._meta.verbose_name_plural),

                        'admin_url': mark_safe('%s/%s/' % (app_label, model.__name__.lower())),

                        'admin_url': reverse('admin:%s_%s_changelist' % info, current_app=self.name),

                        'add_url': reverse('admin:%s_%s_add' % info, current_app=self.name),

                        'perms': perms,

                    }

                    if app_label in app_dict:
@@ -349,7 +351,7 @@ class AdminSite(object): 
                    else:

                        app_dict[app_label] = {

                            'name': app_label.title(),

                            'app_url': app_label + '/',

                            'app_url': reverse('admin:app_list', kwargs={'app_label': app_label}, current_app=self.name),

                            'has_module_perms': has_module_perms,

                            'models': [model_dict],

                        }
@@ -383,9 +385,11 @@ class AdminSite(object): 
                    # Check whether user has any perm for this module.

                    # If so, add the module to the model_list.

                    if True in perms.values():

                        info = (app_label, model._meta.module_name)

                        model_dict = {

                            'name': capfirst(model._meta.verbose_name_plural),

                            'admin_url': '%s/' % model.__name__.lower(),

                            'admin_url': reverse('admin:%s_%s_changelist' % info, current_app=self.name),

                            'add_url': reverse('admin:%s_%s_add' % info, current_app=self.name),

                            'perms': perms,

                        }

                        if app_dict:

django/contrib/admin/templates/admin/500.html

+7 −1
Original line number Diff line number Diff line 
{% extends "admin/base_site.html" %}

{% load i18n %}

{% load url from future %}



{% block breadcrumbs %}<div class="breadcrumbs"><a href="/">{% trans "Home" %}</a> &rsaquo; {% trans "Server error" %}</div>{% endblock %}

{% block breadcrumbs %}

<div class="breadcrumbs">

<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>

&rsaquo; {% trans 'Server error' %}

</div>

{% endblock %}



{% block title %}{% trans 'Server error (500)' %}{% endblock %}

django/contrib/admin/templates/admin/app_index.html

+11 −9
Original line number Diff line number Diff line 
{% extends "admin/index.html" %}

{% load i18n %}

{% load url from future %}



{% if not is_popup %}



{% block breadcrumbs %}

<div class="breadcrumbs"><a href="../">

{% trans "Home" %}</a> &rsaquo; 

<div class="breadcrumbs">

<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>

&rsaquo;

{% for app in app_list %}

{% blocktrans with app.name as name %}{{ name }}{% endblocktrans %}

{% endfor %}</div>{% endblock %}



{% endfor %}

</div>

{% endblock %}

{% endif %}



{% block sidebar %}{% endblock %}

django/contrib/admin/templates/admin/auth/user/change_password.html

+11 −8
Original line number Diff line number Diff line 
{% extends "admin/base_site.html" %}

{% load i18n admin_static admin_modify %}

{% load url from future %}

{% load admin_urls %}



{% block extrahead %}{{ block.super }}

{% url 'admin:jsi18n' as jsi18nurl %}

<script type="text/javascript" src="{{ jsi18nurl|default:"../../../../jsi18n/" }}"></script>

{% endblock %}

{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %}

{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}

{% block breadcrumbs %}{% if not is_popup %}

<div class="breadcrumbs">

     <a href="../../../../">{% trans "Home" %}</a> &rsaquo;

     <a href="../../../">{{ opts.app_label|capfirst|escape }}</a> &rsaquo;

     <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;

     <a href="../">{{ original|truncatewords:"18" }}</a> &rsaquo;

     {% trans 'Change password' %}

{% if not is_popup %}

{% block breadcrumbs %}

<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>

&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_label|capfirst|escape }}</a>

&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>

&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}{{ original.pk }}">{{ original|truncatewords:"18" }}</a>

&rsaquo; {% trans 'Change password' %}

</div>

{% endif %}{% endblock %}

{% endblock %}

{% endif %}

{% block content %}<div id="content-main">

<form action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}

<div>