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

AUTHORS

+3 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@ The PRIMARY AUTHORS are (and/or have been):
		* Claude Paroz
		* Anssi Kääriäinen
		* Florian Apolloner
		* Jeremy Dunck
		* Bryan Veloso

		More information on the main contributors to Django can be found in
		docs/internals/committers.txt.
		@@ -167,7 +169,6 @@ answer newbie questions, and generally made Django that much better:
		dready <wil@mojipage.com>
		Maximillian Dornseif <md@hudora.de>
		Daniel Duan <DaNmarner@gmail.com>
		Jeremy Dunck <http://dunck.us/>
		Andrew Durdin <adurdin@gmail.com>
		dusk@woofle.net
		Andy Dustman <farcepest@gmail.com>
		@@ -506,6 +507,7 @@ answer newbie questions, and generally made Django that much better:
		Johan C. Stöver <johan@nilling.nl>
		Nowell Strite <http://nowell.strite.org/>
		Thomas Stromberg <tstromberg@google.com>
		Travis Swicegood <travis@domain51.com>
		Pascal Varet
		SuperJared
		Radek Švarz <http://www.svarz.cz/translate/>

django/conf/init.py

+13 −5

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ a list of all possible variables.
		"""

		import os
		import re
		import time # Needed for Windows
		import warnings

		@@ -26,7 +25,7 @@ class LazySettings(LazyObject):
		The user can manually configure settings prior to using them. Otherwise,
		Django uses the settings module pointed to by DJANGO_SETTINGS_MODULE.
		"""
		def _setup(self):
		def _setup(self, name):
		"""
		Load the settings module pointed to by the environment variable. This
		is used the first time we need any settings at all, if the user has not
		@@ -37,12 +36,21 @@ class LazySettings(LazyObject):
		if not settings_module: # If it's set but is an empty string.
		raise KeyError
		except KeyError:
		# NOTE: This is arguably an EnvironmentError, but that causes
		# problems with Python's interactive help.
		raise ImportError("Settings cannot be imported, because environment variable %s is undefined." % ENVIRONMENT_VARIABLE)
		raise ImproperlyConfigured(
		"Requested setting %s, but settings are not configured. "
		"You must either define the environment variable %s "
		"or call settings.configure() before accessing settings."
		% (name, ENVIRONMENT_VARIABLE))

		self._wrapped = Settings(settings_module)


		def __getattr__(self, name):
		if self._wrapped is empty:
		self._setup(name)
		return getattr(self._wrapped, name)


		def configure(self, default_settings=global_settings, **options):
		"""
		Called to manually configure the settings. The 'default_settings'

django/contrib/admin/filters.py

+6 −3

Original line number	Diff line number	Diff line
		@@ -8,13 +8,13 @@ certain test -- e.g. being a DateField or ForeignKey.
		import datetime

		from django.db import models
		from django.core.exceptions import ImproperlyConfigured
		from django.core.exceptions import ImproperlyConfigured, ValidationError
		from django.utils.encoding import smart_text
		from django.utils.translation import ugettext_lazy as _
		from django.utils import timezone

		from django.contrib.admin.util import (get_model_from_relation,
		reverse_field_path, get_limit_choices_to_from_path, prepare_lookup_value)
		from django.contrib.admin.options import IncorrectLookupParameters

		class ListFilter(object):
		title = None # Human-readable title to appear in the right sidebar.
		@@ -129,7 +129,10 @@ class FieldListFilter(ListFilter):
		return True

		def queryset(self, request, queryset):
		try:
		return queryset.filter(**self.used_parameters)
		except ValidationError as e:
		raise IncorrectLookupParameters(e)

		@classmethod
		def register(cls, test, list_filter_class, take_priority=False):

django/contrib/admin/options.py

+4 −1

Original line number	Diff line number	Diff line
		@@ -14,9 +14,10 @@ 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.constants import LOOKUP_SEP
		from django.db.models.related import RelatedObject
		from django.db.models.fields import BLANK_CHOICE_DASH, FieldDoesNotExist
		from django.db.models.sql.constants import LOOKUP_SEP, QUERY_TERMS
		from django.db.models.sql.constants import QUERY_TERMS
		from django.http import Http404, HttpResponse, HttpResponseRedirect
		from django.shortcuts import get_object_or_404
		from django.template.response import SimpleTemplateResponse, TemplateResponse
		@@ -1456,8 +1457,10 @@ class InlineModelAdmin(BaseModelAdmin):
		return request.user.has_perm(
		self.opts.app_label + '.' + self.opts.get_delete_permission())


		class StackedInline(InlineModelAdmin):
		template = 'admin/edit_inline/stacked.html'


		class TabularInline(InlineModelAdmin):
		template = 'admin/edit_inline/tabular.html'

django/contrib/admin/static/admin/js/inlines.js

+254 −118

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		* All rights reserved.
		*
		* Spiced up with Code from Zain Memon's GSoC project 2009
		* and modified for Django by Jannis Leidel
		* and modified for Django by Jannis Leidel, Travis Swicegood and Julien Phalip.
		*
		* Licensed under the New BSD License
		* See: http://www.opensource.org/licenses/bsd-license.php
		@@ -17,6 +17,8 @@
		(function($) {
		$.fn.formset = function(opts) {
		var options = $.extend({}, $.fn.formset.defaults, opts);
		var $this = $(this);
		var $parent = $this.parent();
		var updateElementIndex = function(el, prefix, ndx) {
		var id_regex = new RegExp("(" + prefix + "-(\\d+\|__prefix__))");
		var replacement = prefix + "-" + ndx;
		@@ -36,21 +38,21 @@
		// only show the add button if we are allowed to add more items,
		// note that max_num = None translates to a blank string.
		var showAddButton = maxForms.val() === '' \|\| (maxForms.val()-totalForms.val()) > 0;
		$(this).each(function(i) {
		$this.each(function(i) {
		$(this).not("." + options.emptyCssClass).addClass(options.formCssClass);
		});
		if ($(this).length && showAddButton) {
		if ($this.length && showAddButton) {
		var addButton;
		if ($(this).attr("tagName") == "TR") {
		if ($this.attr("tagName") == "TR") {
		// If forms are laid out as table rows, insert the
		// "add" button in a new table row:
		var numCols = this.eq(-1).children().length;
		$(this).parent().append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="javascript:void(0)">' + options.addText + "</a></tr>");
		addButton = $(this).parent().find("tr:last a");
		$parent.append('<tr class="' + options.addCssClass + '"><td colspan="' + numCols + '"><a href="javascript:void(0)">' + options.addText + "</a></tr>");
		addButton = $parent.find("tr:last a");
		} else {
		// Otherwise, insert it immediately after the last form:
		$(this).filter(":last").after('<div class="' + options.addCssClass + '"><a href="javascript:void(0)">' + options.addText + "</a></div>");
		addButton = $(this).filter(":last").next().find("a");
		$this.filter(":last").after('<div class="' + options.addCssClass + '"><a href="javascript:void(0)">' + options.addText + "</a></div>");
		addButton = $this.filter(":last").next().find("a");
		}
		addButton.click(function(e) {
		e.preventDefault();
		@@ -121,6 +123,7 @@
		}
		return this;
		};

		/* Setup plugin defaults */
		$.fn.formset.defaults = {
		prefix: "form", // The form prefix for your django formset
		@@ -133,4 +136,137 @@
		added: null, // Function called each time a new form is added
		removed: null // Function called each time a form is deleted
		};


		// Tabular inlines ---------------------------------------------------------
		$.fn.tabularFormset = function(options) {
		var $rows = $(this);
		var alternatingRows = function(row) {
		$($rows.selector).not(".add-row").removeClass("row1 row2")
		.filter(":even").addClass("row1").end()
		.filter(":odd").addClass("row2");
		};

		var reinitDateTimeShortCuts = function() {
		// Reinitialize the calendar and clock widgets by force
		if (typeof DateTimeShortcuts != "undefined") {
		$(".datetimeshortcuts").remove();
		DateTimeShortcuts.init();
		}
		};

		var updateSelectFilter = function() {
		// If any SelectFilter widgets are a part of the new form,
		// instantiate a new SelectFilter instance for it.
		if (typeof SelectFilter != 'undefined'){
		$('.selectfilter').each(function(index, value){
		var namearr = value.name.split('-');
		SelectFilter.init(value.id, namearr[namearr.length-1], false, options.adminStaticPrefix );
		});
		$('.selectfilterstacked').each(function(index, value){
		var namearr = value.name.split('-');
		SelectFilter.init(value.id, namearr[namearr.length-1], true, options.adminStaticPrefix );
		});
		}
		};

		var initPrepopulatedFields = function(row) {
		row.find('.prepopulated_field').each(function() {
		var field = $(this),
		input = field.find('input, select, textarea'),
		dependency_list = input.data('dependency_list') \|\| [],
		dependencies = [];
		$.each(dependency_list, function(i, field_name) {
		dependencies.push('#' + row.find('.field-' + field_name).find('input, select, textarea').attr('id'));
		});
		if (dependencies.length) {
		input.prepopulate(dependencies, input.attr('maxlength'));
		}
		});
		};

		$rows.formset({
		prefix: options.prefix,
		addText: options.addText,
		formCssClass: "dynamic-" + options.prefix,
		deleteCssClass: "inline-deletelink",
		deleteText: options.deleteText,
		emptyCssClass: "empty-form",
		removed: alternatingRows,
		added: function(row) {
		initPrepopulatedFields(row);
		reinitDateTimeShortCuts();
		updateSelectFilter();
		alternatingRows(row);
		}
		});

		return $rows;
		};

		// Stacked inlines ---------------------------------------------------------
		$.fn.stackedFormset = function(options) {
		var $rows = $(this);
		var updateInlineLabel = function(row) {
		$($rows.selector).find(".inline_label").each(function(i) {
		var count = i + 1;
		$(this).html($(this).html().replace(/(#\d+)/g, "#" + count));
		});
		};

		var reinitDateTimeShortCuts = function() {
		// Reinitialize the calendar and clock widgets by force, yuck.
		if (typeof DateTimeShortcuts != "undefined") {
		$(".datetimeshortcuts").remove();
		DateTimeShortcuts.init();
		}
		};

		var updateSelectFilter = function() {
		// If any SelectFilter widgets were added, instantiate a new instance.
		if (typeof SelectFilter != "undefined"){
		$(".selectfilter").each(function(index, value){
		var namearr = value.name.split('-');
		SelectFilter.init(value.id, namearr[namearr.length-1], false, options.adminStaticPrefix);
		});
		$(".selectfilterstacked").each(function(index, value){
		var namearr = value.name.split('-');
		SelectFilter.init(value.id, namearr[namearr.length-1], true, options.adminStaticPrefix);
		});
		}
		};

		var initPrepopulatedFields = function(row) {
		row.find('.prepopulated_field').each(function() {
		var field = $(this),
		input = field.find('input, select, textarea'),
		dependency_list = input.data('dependency_list') \|\| [],
		dependencies = [];
		$.each(dependency_list, function(i, field_name) {
		dependencies.push('#' + row.find('.form-row .field-' + field_name).find('input, select, textarea').attr('id'));
		});
		if (dependencies.length) {
		input.prepopulate(dependencies, input.attr('maxlength'));
		}
		});
		};

		$rows.formset({
		prefix: options.prefix,
		addText: options.addText,
		formCssClass: "dynamic-" + options.prefix,
		deleteCssClass: "inline-deletelink",
		deleteText: options.deleteText,
		emptyCssClass: "empty-form",
		removed: updateInlineLabel,
		added: (function(row) {
		initPrepopulatedFields(row);
		reinitDateTimeShortCuts();
		updateSelectFilter();
		updateInlineLabel(row);
		})
		});

		return $rows;
		};
		})(django.jQuery);