Merge remote-tracking branch 'core/master' into schema-alteration (9daf81b9) · Commits · Dom Sekotill / django

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,5 +4,6 @@
		MANIFEST
		dist/
		docs/_build/
		docs/locale/
		tests/coverage_html/
		tests/.coverage

AUTHORS

+2 −1

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ The PRIMARY AUTHORS are (and/or have been):
		* Donald Stufft
		* Daniel Lindsley
		* Marc Tamlyn
		* Baptiste Mispelon

		More information on the main contributors to Django can be found in
		docs/internals/committers.txt.
		@@ -413,7 +414,6 @@ answer newbie questions, and generally made Django that much better:
		Slawek Mikula <slawek dot mikula at gmail dot com>
		Katie Miller <katie@sub50.com>
		Shawn Milochik <shawn@milochik.com>
		Baptiste Mispelon <bmispelon@gmail.com>
		mitakummaa@gmail.com
		Taylor Mitchell <taylor.mitchell@gmail.com>
		mmarshall
		@@ -550,6 +550,7 @@ answer newbie questions, and generally made Django that much better:
		Thomas Steinacher <http://www.eggdrop.ch/>
		Emil Stenström <em@kth.se>
		Johan C. Stöver <johan@nilling.nl>
		Chris Streeter <chris@chrisstreeter.com>
		Nowell Strite <http://nowell.strite.org/>
		Thomas Stromberg <tstromberg@google.com>
		Hannes Struß <x@hannesstruss.de>

django/contrib/admin/forms.py

+3 −6

Original line number	Diff line number	Diff line
		@@ -22,15 +22,12 @@ class AdminAuthenticationForm(AuthenticationForm):
		username = self.cleaned_data.get('username')
		password = self.cleaned_data.get('password')
		message = ERROR_MESSAGE
		params = {'username': self.username_field.verbose_name}

		if username and password:
		self.user_cache = authenticate(username=username, password=password)
		if self.user_cache is None:
		raise forms.ValidationError(message % {
		'username': self.username_field.verbose_name
		})
		raise forms.ValidationError(message, code='invalid', params=params)
		elif not self.user_cache.is_active or not self.user_cache.is_staff:
		raise forms.ValidationError(message % {
		'username': self.username_field.verbose_name
		})
		raise forms.ValidationError(message, code='invalid', params=params)
		return self.cleaned_data

django/contrib/admin/options.py

+84 −33

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ from django.contrib.admin.util import (unquote, flatten_fieldsets, get_deleted_o
		model_format_dict, NestedObjects, lookup_needs_distinct)
		from django.contrib.admin import validation
		from django.contrib.admin.templatetags.admin_static import static
		from django.contrib.admin.templatetags.admin_urls import add_preserved_filters
		from django.contrib import messages
		from django.views.decorators.csrf import csrf_protect
		from django.core.exceptions import PermissionDenied, ValidationError, FieldError
		@@ -33,6 +34,7 @@ from django.utils.html import escape, escapejs
		from django.utils.safestring import mark_safe
		from django.utils import six
		from django.utils.deprecation import RenameMethodsBase
		from django.utils.http import urlencode
		from django.utils.text import capfirst, get_text_list
		from django.utils.translation import ugettext as _
		from django.utils.translation import ungettext
		@@ -393,6 +395,7 @@ class ModelAdmin(BaseModelAdmin):
		save_as = False
		save_on_top = False
		paginator = Paginator
		preserve_filters = True
		inlines = []

		# Custom templates (designed to be over-ridden in subclasses)
		@@ -755,6 +758,27 @@ class ModelAdmin(BaseModelAdmin):
		"""
		return self.list_filter

		def get_preserved_filters(self, request):
		"""
		Returns the preserved filters querystring.
		"""

		# FIXME: We can remove that getattr as soon as #20619 is fixed.
		match = getattr(request, 'resolver_match', None)

		if self.preserve_filters and match:
		opts = self.model._meta
		current_url = '%s:%s' % (match.namespace, match.url_name)
		changelist_url = 'admin:%s_%s_changelist' % (opts.app_label, opts.model_name)
		if current_url == changelist_url:
		preserved_filters = request.GET.urlencode()
		else:
		preserved_filters = request.GET.get('_changelist_filters')

		if preserved_filters:
		return urlencode({'_changelist_filters': preserved_filters})
		return ''

		def construct_change_message(self, request, form, formsets):
		"""
		Construct a change message from a changed object.
		@@ -846,6 +870,8 @@ class ModelAdmin(BaseModelAdmin):
		def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None):
		opts = self.model._meta
		app_label = opts.app_label
		preserved_filters = self.get_preserved_filters(request)
		form_url = add_preserved_filters({'preserved_filters': preserved_filters, 'opts': opts}, form_url)
		context.update({
		'add': add,
		'change': change,
		@@ -877,11 +903,19 @@ class ModelAdmin(BaseModelAdmin):
		"""
		opts = obj._meta
		pk_value = obj._get_pk_val()
		preserved_filters = self.get_preserved_filters(request)

		msg_dict = {'name': force_text(opts.verbose_name), 'obj': force_text(obj)}
		# Here, we distinguish between different save types by checking for
		# the presence of keys in request.POST.
		if "_continue" in request.POST:
		if "_popup" in request.POST:
		return HttpResponse(
		'<!DOCTYPE html><html><head><title></title></head><body>'
		'<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script></body></html>' % \
		# escape() calls force_text.
		(escape(pk_value), escapejs(obj)))

		elif "_continue" in request.POST:
		msg = _('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % msg_dict
		self.message_user(request, msg, messages.SUCCESS)
		if post_url_continue is None:
		@@ -889,20 +923,16 @@ class ModelAdmin(BaseModelAdmin):
		(opts.app_label, opts.model_name),
		args=(pk_value,),
		current_app=self.admin_site.name)
		if "_popup" in request.POST:
		post_url_continue += "?_popup=1"
		post_url_continue = add_preserved_filters({'preserved_filters': preserved_filters, 'opts': opts}, post_url_continue)
		return HttpResponseRedirect(post_url_continue)

		if "_popup" in request.POST:
		return HttpResponse(
		'<!DOCTYPE html><html><head><title></title></head><body>'
		'<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script></body></html>' % \
		# escape() calls force_text.
		(escape(pk_value), escapejs(obj)))
		elif "_addanother" in request.POST:
		msg = _('The %(name)s "%(obj)s" was added successfully. You may add another %(name)s below.') % msg_dict
		self.message_user(request, msg, messages.SUCCESS)
		return HttpResponseRedirect(request.path)
		redirect_url = request.path
		redirect_url = add_preserved_filters({'preserved_filters': preserved_filters, 'opts': opts}, redirect_url)
		return HttpResponseRedirect(redirect_url)

		else:
		msg = _('The %(name)s "%(obj)s" was added successfully.') % msg_dict
		self.message_user(request, msg, messages.SUCCESS)
		@@ -913,30 +943,36 @@ class ModelAdmin(BaseModelAdmin):
		Determines the HttpResponse for the change_view stage.
		"""
		opts = self.model._meta

		pk_value = obj._get_pk_val()
		preserved_filters = self.get_preserved_filters(request)

		msg_dict = {'name': force_text(opts.verbose_name), 'obj': force_text(obj)}
		if "_continue" in request.POST:
		msg = _('The %(name)s "%(obj)s" was changed successfully. You may edit it again below.') % msg_dict
		self.message_user(request, msg, messages.SUCCESS)
		if "_popup" in request.REQUEST:
		return HttpResponseRedirect(request.path + "?_popup=1")
		else:
		return HttpResponseRedirect(request.path)
		redirect_url = request.path
		redirect_url = add_preserved_filters({'preserved_filters': preserved_filters, 'opts': opts}, redirect_url)
		return HttpResponseRedirect(redirect_url)

		elif "_saveasnew" in request.POST:
		msg = _('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % msg_dict
		self.message_user(request, msg, messages.SUCCESS)
		return HttpResponseRedirect(reverse('admin:%s_%s_change' %
		redirect_url = reverse('admin:%s_%s_change' %
		(opts.app_label, opts.model_name),
		args=(pk_value,),
		current_app=self.admin_site.name))
		current_app=self.admin_site.name)
		redirect_url = add_preserved_filters({'preserved_filters': preserved_filters, 'opts': opts}, redirect_url)
		return HttpResponseRedirect(redirect_url)

		elif "_addanother" in request.POST:
		msg = _('The %(name)s "%(obj)s" was changed successfully. You may add another %(name)s below.') % msg_dict
		self.message_user(request, msg, messages.SUCCESS)
		return HttpResponseRedirect(reverse('admin:%s_%s_add' %
		redirect_url = reverse('admin:%s_%s_add' %
		(opts.app_label, opts.model_name),
		current_app=self.admin_site.name))
		current_app=self.admin_site.name)
		redirect_url = add_preserved_filters({'preserved_filters': preserved_filters, 'opts': opts}, redirect_url)
		return HttpResponseRedirect(redirect_url)

		else:
		msg = _('The %(name)s "%(obj)s" was changed successfully.') % msg_dict
		self.message_user(request, msg, messages.SUCCESS)
		@@ -952,6 +988,8 @@ class ModelAdmin(BaseModelAdmin):
		post_url = reverse('admin:%s_%s_changelist' %
		(opts.app_label, opts.model_name),
		current_app=self.admin_site.name)
		preserved_filters = self.get_preserved_filters(request)
		post_url = add_preserved_filters({'preserved_filters': preserved_filters, 'opts': opts}, post_url)
		else:
		post_url = reverse('admin:index',
		current_app=self.admin_site.name)
		@@ -963,10 +1001,13 @@ class ModelAdmin(BaseModelAdmin):
		when editing an existing object.
		"""
		opts = self.model._meta

		if self.has_change_permission(request, None):
		post_url = reverse('admin:%s_%s_changelist' %
		(opts.app_label, opts.model_name),
		current_app=self.admin_site.name)
		preserved_filters = self.get_preserved_filters(request)
		post_url = add_preserved_filters({'preserved_filters': preserved_filters, 'opts': opts}, post_url)
		else:
		post_url = reverse('admin:index',
		current_app=self.admin_site.name)
		@@ -1122,6 +1163,7 @@ class ModelAdmin(BaseModelAdmin):
		'inline_admin_formsets': inline_admin_formsets,
		'errors': helpers.AdminErrorList(form, formsets),
		'app_label': opts.app_label,
		'preserved_filters': self.get_preserved_filters(request),
		}
		context.update(extra_context or {})
		return self.render_change_form(request, context, form_url=form_url, add=True)
		@@ -1214,6 +1256,7 @@ class ModelAdmin(BaseModelAdmin):
		'inline_admin_formsets': inline_admin_formsets,
		'errors': helpers.AdminErrorList(form, formsets),
		'app_label': opts.app_label,
		'preserved_filters': self.get_preserved_filters(request),
		}
		context.update(extra_context or {})
		return self.render_change_form(request, context, change=True, obj=obj, form_url=form_url)
		@@ -1357,11 +1400,13 @@ class ModelAdmin(BaseModelAdmin):
		'cl': cl,
		'media': media,
		'has_add_permission': self.has_add_permission(request),
		'opts': cl.opts,
		'app_label': app_label,
		'action_form': action_form,
		'actions_on_top': self.actions_on_top,
		'actions_on_bottom': self.actions_on_bottom,
		'actions_selection_counter': self.actions_selection_counter,
		'preserved_filters': self.get_preserved_filters(request),
		}
		context.update(extra_context or {})

		@@ -1406,12 +1451,16 @@ class ModelAdmin(BaseModelAdmin):
		'obj': force_text(obj_display)},
		messages.SUCCESS)

		if not self.has_change_permission(request, None):
		return HttpResponseRedirect(reverse('admin:index',
		current_app=self.admin_site.name))
		return HttpResponseRedirect(reverse('admin:%s_%s_changelist' %
		if self.has_change_permission(request, None):
		post_url = reverse('admin:%s_%s_changelist' %
		(opts.app_label, opts.model_name),
		current_app=self.admin_site.name))
		current_app=self.admin_site.name)
		preserved_filters = self.get_preserved_filters(request)
		post_url = add_preserved_filters({'preserved_filters': preserved_filters, 'opts': opts}, post_url)
		else:
		post_url = reverse('admin:index',
		current_app=self.admin_site.name)
		return HttpResponseRedirect(post_url)

		object_name = force_text(opts.verbose_name)

		@@ -1429,6 +1478,7 @@ class ModelAdmin(BaseModelAdmin):
		"protected": protected,
		"opts": opts,
		"app_label": app_label,
		'preserved_filters': self.get_preserved_filters(request),
		}
		context.update(extra_context or {})

		@@ -1463,6 +1513,7 @@ class ModelAdmin(BaseModelAdmin):
		'object': obj,
		'app_label': app_label,
		'opts': opts,
		'preserved_filters': self.get_preserved_filters(request),
		}
		context.update(extra_context or {})
		return TemplateResponse(request, self.object_history_template or [
		@@ -1574,13 +1625,13 @@ class InlineModelAdmin(BaseModelAdmin):
		'class_name': p._meta.verbose_name,
		'instance': p}
		)
		msg_dict = {'class_name': self._meta.model._meta.verbose_name,
		params = {'class_name': self._meta.model._meta.verbose_name,
		'instance': self.instance,
		'related_objects': get_text_list(objs, _('and'))}
		msg = _("Deleting %(class_name)s %(instance)s would require "
		"deleting the following protected related objects: "
		"%(related_objects)s") % msg_dict
		raise ValidationError(msg)
		"%(related_objects)s")
		raise ValidationError(msg, code='deleting_protected', params=params)

		def is_valid(self):
		result = super(DeleteProtectedModelForm, self).is_valid()

django/contrib/admin/templates/admin/change_form.html

+5 −3

Original line number	Diff line number	Diff line
		{% extends "admin/base_site.html" %}
		{% load i18n admin_static admin_modify %}
		{% load admin_urls %}
		{% load i18n admin_urls admin_static admin_modify %}

		{% block extrahead %}{{ block.super }}
		<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
		@@ -29,7 +28,10 @@
		{% if change %}{% if not is_popup %}
		<ul class="object-tools">
		{% block object-tools-items %}
		<li><a href="{% url opts\|admin_urlname:'history' original.pk\|admin_urlquote %}" class="historylink">{% trans "History" %}</a></li>
		<li>
		{% url opts\|admin_urlname:'history' original.pk\|admin_urlquote as history_url %}
		<a href="{% add_preserved_filters history_url %}" class="historylink">{% trans "History" %}</a>
		</li>
		{% if has_absolute_url %}<li><a href="{% url 'admin:view_on_site' content_type_id original.pk %}" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif%}
		{% endblock %}
		</ul>