Fixed #19689 -- Renamed `Model._meta.module_name` to `model_name`. (ec469ade) · Commits · Dom Sekotill / django

django/contrib/admin/actions.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ def delete_selected(modeladmin, request, queryset):

		# Display the confirmation page
		return TemplateResponse(request, modeladmin.delete_selected_confirmation_template or [
		"admin/%s/%s/delete_selected_confirmation.html" % (app_label, opts.object_name.lower()),
		"admin/%s/%s/delete_selected_confirmation.html" % (app_label, opts.model_name),
		"admin/%s/delete_selected_confirmation.html" % app_label,
		"admin/delete_selected_confirmation.html"
		], context, current_app=modeladmin.admin_site.name)

django/contrib/admin/options.py

+12 −12

Original line number	Diff line number	Diff line
		@@ -371,7 +371,7 @@ class ModelAdmin(BaseModelAdmin):
		return self.admin_site.admin_view(view)(args, *kwargs)
		return update_wrapper(wrapper, view)

		info = self.model._meta.app_label, self.model._meta.module_name
		info = self.model._meta.app_label, self.model._meta.model_name

		urlpatterns = patterns('',
		url(r'^$',
		@@ -783,7 +783,7 @@ class ModelAdmin(BaseModelAdmin):
		form_template = self.change_form_template

		return TemplateResponse(request, form_template or [
		"admin/%s/%s/change_form.html" % (app_label, opts.object_name.lower()),
		"admin/%s/%s/change_form.html" % (app_label, opts.model_name),
		"admin/%s/change_form.html" % app_label,
		"admin/change_form.html"
		], context, current_app=self.admin_site.name)
		@@ -803,7 +803,7 @@ class ModelAdmin(BaseModelAdmin):
		self.message_user(request, msg)
		if post_url_continue is None:
		post_url_continue = reverse('admin:%s_%s_change' %
		(opts.app_label, opts.module_name),
		(opts.app_label, opts.model_name),
		args=(pk_value,),
		current_app=self.admin_site.name)
		if "_popup" in request.POST:
		@@ -845,14 +845,14 @@ class ModelAdmin(BaseModelAdmin):
		msg = _('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % msg_dict
		self.message_user(request, msg)
		return HttpResponseRedirect(reverse('admin:%s_%s_change' %
		(opts.app_label, opts.module_name),
		(opts.app_label, opts.model_name),
		args=(pk_value,),
		current_app=self.admin_site.name))
		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)
		return HttpResponseRedirect(reverse('admin:%s_%s_add' %
		(opts.app_label, opts.module_name),
		(opts.app_label, opts.model_name),
		current_app=self.admin_site.name))
		else:
		msg = _('The %(name)s "%(obj)s" was changed successfully.') % msg_dict
		@@ -867,7 +867,7 @@ class ModelAdmin(BaseModelAdmin):
		opts = self.model._meta
		if self.has_change_permission(request, None):
		post_url = reverse('admin:%s_%s_changelist' %
		(opts.app_label, opts.module_name),
		(opts.app_label, opts.model_name),
		current_app=self.admin_site.name)
		else:
		post_url = reverse('admin:index',
		@@ -882,7 +882,7 @@ class ModelAdmin(BaseModelAdmin):
		opts = self.model._meta
		if self.has_change_permission(request, None):
		post_url = reverse('admin:%s_%s_changelist' %
		(opts.app_label, opts.module_name),
		(opts.app_label, opts.model_name),
		current_app=self.admin_site.name)
		else:
		post_url = reverse('admin:index',
		@@ -1060,7 +1060,7 @@ class ModelAdmin(BaseModelAdmin):

		if request.method == 'POST' and "_saveasnew" in request.POST:
		return self.add_view(request, form_url=reverse('admin:%s_%s_add' %
		(opts.app_label, opts.module_name),
		(opts.app_label, opts.model_name),
		current_app=self.admin_site.name))

		ModelForm = self.get_form(request, obj)
		@@ -1283,7 +1283,7 @@ class ModelAdmin(BaseModelAdmin):
		context.update(extra_context or {})

		return TemplateResponse(request, self.change_list_template or [
		'admin/%s/%s/change_list.html' % (app_label, opts.object_name.lower()),
		'admin/%s/%s/change_list.html' % (app_label, opts.model_name),
		'admin/%s/change_list.html' % app_label,
		'admin/change_list.html'
		], context, current_app=self.admin_site.name)
		@@ -1323,7 +1323,7 @@ class ModelAdmin(BaseModelAdmin):
		return HttpResponseRedirect(reverse('admin:index',
		current_app=self.admin_site.name))
		return HttpResponseRedirect(reverse('admin:%s_%s_changelist' %
		(opts.app_label, opts.module_name),
		(opts.app_label, opts.model_name),
		current_app=self.admin_site.name))

		object_name = force_text(opts.verbose_name)
		@@ -1346,7 +1346,7 @@ class ModelAdmin(BaseModelAdmin):
		context.update(extra_context or {})

		return TemplateResponse(request, self.delete_confirmation_template or [
		"admin/%s/%s/delete_confirmation.html" % (app_label, opts.object_name.lower()),
		"admin/%s/%s/delete_confirmation.html" % (app_label, opts.model_name),
		"admin/%s/delete_confirmation.html" % app_label,
		"admin/delete_confirmation.html"
		], context, current_app=self.admin_site.name)
		@@ -1373,7 +1373,7 @@ class ModelAdmin(BaseModelAdmin):
		}
		context.update(extra_context or {})
		return TemplateResponse(request, self.object_history_template or [
		"admin/%s/%s/object_history.html" % (app_label, opts.object_name.lower()),
		"admin/%s/%s/object_history.html" % (app_label, opts.model_name),
		"admin/%s/object_history.html" % app_label,
		"admin/object_history.html"
		], context, current_app=self.admin_site.name)

django/contrib/admin/sites.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -247,7 +247,7 @@ class AdminSite(object):
		# Add in each model's views.
		for model, model_admin in six.iteritems(self._registry):
		urlpatterns += patterns('',
		url(r'^%s/%s/' % (model._meta.app_label, model._meta.module_name),
		url(r'^%s/%s/' % (model._meta.app_label, model._meta.model_name),
		include(model_admin.urls))
		)
		return urlpatterns
		@@ -351,7 +351,7 @@ 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)
		info = (app_label, model._meta.model_name)
		model_dict = {
		'name': capfirst(model._meta.verbose_name_plural),
		'object_name': model._meta.object_name,
		@@ -407,7 +407,7 @@ 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)
		info = (app_label, model._meta.model_name)
		model_dict = {
		'name': capfirst(model._meta.verbose_name_plural),
		'object_name': model._meta.object_name,

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		{% 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 %}
		<form action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
		<div>
		{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
		{% if form.errors %}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@
		</ul>
		{% endif %}{% endif %}
		{% endblock %}
		<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
		<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form">{% csrf_token %}{% block form_top %}{% endblock %}
		<div>
		{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
		{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %}