Fixed #22894 -- Made admin add related/raw ID fields widgets customizable. (68c9a72e) · Commits · Dom Sekotill / django

django/contrib/admin/static/admin/css/forms.css

+19 −0

Original line number	Diff line number	Diff line
		@@ -374,3 +374,22 @@ body.popup .submit-row {
		.empty-form {
		display: none;
		}

		/* RELATED FIELD ADD ONE / LOOKUP */

		.add-another, .related-lookup {
		margin-left: 5px;
		display: inline-block;
		}

		.add-another {
		width: 10px;
		height: 10px;
		background-image: url(../img/icon_addlink.gif);
		}

		.related-lookup {
		width: 16px;
		height: 16px;
		background-image: url(../img/selector-search.gif);
		}

django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js

+11 −17

Original line number	Diff line number	Diff line
		@@ -27,20 +27,24 @@ function windowname_to_id(text) {
		return text;
		}

		function showRelatedObjectLookupPopup(triggeringLink) {
		var name = triggeringLink.id.replace(/^lookup_/, '');
		function showAdminPopup(triggeringLink, name_regexp) {
		var name = triggeringLink.id.replace(name_regexp, '');
		name = id_to_windowname(name);
		var href;
		if (triggeringLink.href.search(/\?/) >= 0) {
		href = triggeringLink.href + '&_popup=1';
		var href = triggeringLink.href;
		if (href.indexOf('?') == -1) {
		href += '?_popup=1';
		} else {
		href = triggeringLink.href + '?_popup=1';
		href += '&_popup=1';
		}
		var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
		win.focus();
		return false;
		}

		function showRelatedObjectLookupPopup(triggeringLink) {
		return showAdminPopup(triggeringLink, /^lookup_/);
		}

		function dismissRelatedLookupPopup(win, chosenId) {
		var name = windowname_to_id(win.name);
		var elem = document.getElementById(name);
		@@ -53,17 +57,7 @@ function dismissRelatedLookupPopup(win, chosenId) {
		}

		function showAddAnotherPopup(triggeringLink) {
		var name = triggeringLink.id.replace(/^add_/, '');
		name = id_to_windowname(name);
		var href = triggeringLink.href;
		if (href.indexOf('?') == -1) {
		href += '?_popup=1';
		} else {
		href += '&_popup=1';
		}
		var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes');
		win.focus();
		return false;
		return showAdminPopup(triggeringLink, /^add_/);
		}

		function dismissAddAnotherPopup(win, newId, newRepr) {

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

+12 −2

Original line number	Diff line number	Diff line
		@@ -67,15 +67,25 @@

		{% block submit_buttons_bottom %}{% submit_row %}{% endblock %}

		{% if adminform and add %}
		{% block admin_change_form_document_ready %}
		<script type="text/javascript">
		(function($) {
		$(document).ready(function() {
		$('.add-another').click(function(e) {
		e.preventDefault();
		showAddAnotherPopup(this);
		});
		$('.related-lookup').click(function(e) {
		e.preventDefault();
		showRelatedObjectLookupPopup(this);
		});
		{% if adminform and add %}
		$('form#{{ opts.model_name }}_form :input:visible:enabled:first').focus()
		{% endif %}
		});
		})(django.jQuery);
		</script>
		{% endif %}
		{% endblock %}

		{# JavaScript for prepopulated fields #}
		{% prepopulated_fields_js %}

django/contrib/admin/widgets.py

+6 −10

Original line number	Diff line number	Diff line
		@@ -170,10 +170,8 @@ class ForeignKeyRawIdWidget(forms.TextInput):
		attrs['class'] = 'vForeignKeyRawIdAdminField' # The JavaScript code looks for this hook.
		# TODO: "lookup_id_" is hard-coded here. This should instead use
		# the correct API to determine the ID dynamically.
		extra.append('<a href="%s%s" class="related-lookup" id="lookup_id_%s" onclick="return showRelatedObjectLookupPopup(this);"> ' %
		(related_url, url, name))
		extra.append('<img src="%s" width="16" height="16" alt="%s" /></a>' %
		(static('admin/img/selector-search.gif'), _('Lookup')))
		extra.append('<a href="%s%s" class="related-lookup" id="lookup_id_%s" title="%s"></a>' %
		(related_url, url, name, _('Lookup')))
		output = [super(ForeignKeyRawIdWidget, self).render(name, value, attrs)] + extra
		if value:
		output.append(self.label_for_value(value))
		@@ -265,19 +263,17 @@ class RelatedFieldWidgetWrapper(forms.Widget):

		def render(self, name, value, args, *kwargs):
		from django.contrib.admin.views.main import TO_FIELD_VAR
		rel_to = self.rel.to
		info = (rel_to._meta.app_label, rel_to._meta.model_name)
		self.widget.choices = self.choices
		output = [self.widget.render(name, value, args, *kwargs)]
		if self.can_add_related:
		rel_to = self.rel.to
		info = (rel_to._meta.app_label, rel_to._meta.model_name)
		related_url = reverse('admin:%s_%s_add' % info, current_app=self.admin_site.name)
		url_params = '?%s=%s' % (TO_FIELD_VAR, self.rel.get_related_field().name)
		# TODO: "add_id_" is hard-coded here. This should instead use the
		# correct API to determine the ID dynamically.
		output.append('<a href="%s%s" class="add-another" id="add_id_%s" onclick="return showAddAnotherPopup(this);"> '
		% (related_url, url_params, name))
		output.append('<img src="%s" width="10" height="10" alt="%s"/></a>'
		% (static('admin/img/icon_addlink.gif'), _('Add Another')))
		output.append('<a href="%s%s" class="add-another" id="add_id_%s" title="%s"></a>'
		% (related_url, url_params, name, _('Add Another')))
		return mark_safe(''.join(output))

		def build_attrs(self, extra_attrs=None, **kwargs):

tests/admin_views/tests.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -3990,7 +3990,7 @@ class UserAdminTest(TestCase):
		response = self.client.get('/test_admin/admin/admin_views/album/add/')
		self.assertEqual(response.status_code, 200)
		self.assertContains(response, '/test_admin/admin/auth/user/add')
		self.assertContains(response, 'class="add-another" id="add_id_owner" onclick="return showAddAnotherPopup(this);"')
		self.assertContains(response, 'class="add-another" id="add_id_owner"')
		response = self.client.get('/test_admin/admin/auth/user/add/?_popup=1')
		self.assertEqual(response.status_code, 200)
		self.assertNotContains(response, 'name="_continue"')