From 71e2df77d3cf6b82c8cba1c810195158bfd5d716 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 19 Jan 2006 03:06:01 +0000 Subject: [PATCH] magic-removal: The start of changes to admin code. Moved views/changelist to views/main. Refactored URLs to use old-style app_label/model_name. Removed a lot of cruft that was necessary due to non-app_label/model name URLs. git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2062 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../admin/templates/admin/change_list.html | 2 +- .../contrib/admin/templatetags/admin_list.py | 6 +- django/contrib/admin/urls.py | 10 +- django/contrib/admin/views/changelist.py | 226 ------------- django/contrib/admin/views/main.py | 298 ++++++++++++++---- 5 files changed, 239 insertions(+), 303 deletions(-) delete mode 100644 django/contrib/admin/views/changelist.py diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 5e9c54dae3..b2f1a9cf6e 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -2,7 +2,7 @@ {% load adminmedia admin_list i18n breadcrumbs %} {% block bodyclass %}change-list{% endblock %} {% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} -{% if not is_popup %}{% block breadcrumbs %}{% endblock %}{% endif %} +{% if not is_popup %}{% block breadcrumbs %}{% endblock %}{% endif %} {% block coltype %}flex{% endblock %} {% block content %}
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index 9f63636efd..8f3c7d0bbd 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -1,8 +1,8 @@ -from django.contrib.admin.views.changelist import MAX_SHOW_ALL_ALLOWED, DEFAULT_RESULTS_PER_PAGE, ALL_VAR -from django.contrib.admin.views.changelist import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR -from django.contrib.admin.views.changelist import IS_POPUP_VAR, EMPTY_CHANGELIST_VALUE, MONTHS from django import template from django.conf import settings +from django.contrib.admin.views.main import MAX_SHOW_ALL_ALLOWED, DEFAULT_RESULTS_PER_PAGE, ALL_VAR +from django.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR +from django.contrib.admin.views.main import IS_POPUP_VAR, EMPTY_CHANGELIST_VALUE, MONTHS from django.core.exceptions import ObjectDoesNotExist from django.db import models from django.utils import dateformat diff --git a/django/contrib/admin/urls.py b/django/contrib/admin/urls.py index 18dd027914..468dd73e5e 100644 --- a/django/contrib/admin/urls.py +++ b/django/contrib/admin/urls.py @@ -22,9 +22,9 @@ urlpatterns = patterns('', ('^doc/templates/(?P