Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-21 07:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'kaedroho-url-namespaces'

Browse source
This commit is contained in:
Matt Westcott 2015-07-20 20:07:08 +01:00
commit b01ed96179
137 changed files with 599 additions and 592 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wagtail/wagtailadmin/templates/wagtailadmin/base.html
View file

@ -11,7 +11,7 @@
<span>{% trans "Dashboard" %}</span>
</a>
<form class="nav-search" action="{% url 'wagtailadmin_pages_search' %}" method="get">
<form class="nav-search" action="{% url 'wagtailadmin_pages:search' %}" method="get">
<div>
<label for="menu-search-q">{% trans "Search" %}</label>
<input type="text" id="menu-search-q" name="q" placeholder="{% trans 'Search' %}" />

10
wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
View file

@ -21,26 +21,26 @@
<tr>
<td class="title" valign="top">
<h2>
<a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a>
<a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a>
{% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=revision.page %}
{% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=revision.page %}
</h2>
<ul class="actions">
<li>
<form action="{% url 'wagtailadmin_pages_approve_moderation' revision.id %}" method="POST">
<form action="{% url 'wagtailadmin_pages:approve_moderation' revision.id %}" method="POST">
{% csrf_token %}
<input type="submit" class="button button-small button-secondary" value="{% trans 'Approve' %}">
</form>
</li>
<li class="no-border">
<form action="{% url 'wagtailadmin_pages_reject_moderation' revision.id %}" method="POST">
<form action="{% url 'wagtailadmin_pages:reject_moderation' revision.id %}" method="POST">
{% csrf_token %}
<input type="submit" class="button button-small button-secondary no" value="{% trans 'Reject' %}">
</form>
</li>
<li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages_preview_for_moderation' revision.id %}" class="button button-small button-secondary">{% trans 'Preview' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}" class="button button-small button-secondary">{% trans 'Preview' %}</a></li>
</ul>
</td>
<td valign="top">

6
wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
View file

@ -19,15 +19,15 @@
<tr>
<td class="title" valign="top">
<h2>
<a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a>
<a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a>
{% include "wagtailadmin/pages/listing/_privacy_indicator.html" with page=revision.page %}
{% include "wagtailadmin/pages/listing/_locked_indicator.html" with page=revision.page %}
</h2>
<ul class="actions">
<li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" class="button button-small button-secondary">{% trans "Edit" %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:edit' revision.page.id %}" class="button button-small button-secondary">{% trans "Edit" %}</a></li>
{% if revision.page.has_unpublished_changes %}
<li><a href="{% url 'wagtailadmin_pages_view_draft' revision.page.id %}" class="button button-small button-secondary">{% trans 'Draft' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:view_draft' revision.page.id %}" class="button button-small button-secondary">{% trans 'Draft' %}</a></li>
{% endif %}
{% if revision.page.live %}
<li><a href="{{ revision.page.url }}" class="button button-small button-secondary">{% trans 'Live' %}</a></li>

2
wagtail/wagtailadmin/templates/wagtailadmin/notifications/rejected.html
View file

@ -1,4 +1,4 @@
{% extends 'wagtailadmin/notifications/base_notification.html' %}{% block notification %}{% load i18n %}{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been rejected{% endblocktrans %}
{% blocktrans with title=revision.page.title|safe %}The page "{{ title }}" has been rejected.{% endblocktrans %}
{% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_edit' revision.page.id %}{% endblock %}
{% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}{% endblock %}

4
wagtail/wagtailadmin/templates/wagtailadmin/notifications/submitted.html
View file

@ -1,5 +1,5 @@
{% extends 'wagtailadmin/notifications/base_notification.html' %}{% block notification %}{% load i18n %}{% blocktrans with page=revision.page|safe %}The page "{{ page }}" has been submitted for moderation{% endblocktrans %}
{% blocktrans with page=revision.page|safe %}The page "{{ page }}" has been submitted for moderation.{% endblocktrans %}
{% trans "You can preview the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_preview_for_moderation' revision.id %}
{% trans "You can edit the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages_edit' revision.page.id %}{% endblock %}
{% trans "You can preview the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:preview_for_moderation' revision.id %}
{% trans "You can edit the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' revision.page.id %}{% endblock %}

2
wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html
View file

@ -4,5 +4,5 @@
<div class="nice-padding">
<p>{% trans "This page has been made private by a parent page." %}</p>
<p>{% trans "You can edit the privacy settings on:" %} <a href="{% url 'wagtailadmin_pages_edit' page_with_restriction.id %}">{{ page_with_restriction.title }}</a>
<p>{% trans "You can edit the privacy settings on:" %} <a href="{% url 'wagtailadmin_pages:edit' page_with_restriction.id %}">{{ page_with_restriction.title }}</a>
</div>

2
wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html
View file

@ -4,7 +4,7 @@
<div class="nice-padding">
<p class="help-block help-warning">{% trans "Privacy changes apply to all children of this page too." %}</p>
<form action="{% url 'wagtailadmin_pages_set_privacy' page.id %}" method="POST">
<form action="{% url 'wagtailadmin_pages:set_privacy' page.id %}" method="POST">
{% csrf_token %}
<ul class="fields">
{% include "wagtailadmin/shared/field_as_li.html" with field=form.restriction_type %}

8
wagtail/wagtailadmin/templates/wagtailadmin/pages/_lock_switch.html
View file

@ -9,9 +9,9 @@
{% if page.locked %}
{% if page_perms.can_lock %}
<form action="{% url 'wagtailadmin_pages_unlock' page.id %}" method="POST" class="status-tag primary">
<form action="{% url 'wagtailadmin_pages:unlock' page.id %}" method="POST" class="status-tag primary">
{% csrf_token %}
<input type="hidden" name="next" value="{% url 'wagtailadmin_pages_edit' page.id %}">
<input type="hidden" name="next" value="{% url 'wagtailadmin_pages:edit' page.id %}">
<input type="submit" class="unbutton" value="{% trans "Locked" %}">
</form>
{% else %}
@ -19,9 +19,9 @@
{% endif %}
{% else %}
{% if page_perms.can_lock %}
<form action="{% url 'wagtailadmin_pages_lock' page.id %}" method="POST" class="status-tag secondary">
<form action="{% url 'wagtailadmin_pages:lock' page.id %}" method="POST" class="status-tag secondary">
{% csrf_token %}
<input type="hidden" name="next" value="{% url 'wagtailadmin_pages_edit' page.id %}">
<input type="hidden" name="next" value="{% url 'wagtailadmin_pages:edit' page.id %}">
<input type="submit" class="unbutton" value="{% trans "Unlocked" %}">
</form>
{% else %}

4
wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_create.html
View file

@ -1,4 +1,4 @@
<button class="action-preview {% if icon %}icon icon-view{% endif %}"
data-action="{% url 'wagtailadmin_pages_preview_on_create' content_type.app_label content_type.model parent_page.id %}{% if mode %}?mode={{ mode|urlencode }}{% endif %}"
data-placeholder="{% url 'wagtailadmin_pages_preview' %}"
data-action="{% url 'wagtailadmin_pages:preview_on_create' content_type.app_label content_type.model parent_page.id %}{% if mode %}?mode={{ mode|urlencode }}{% endif %}"
data-placeholder="{% url 'wagtailadmin_pages:preview' %}"
data-windowname="wagtail_preview_{{ parent_page.id }}_child">{{ label }}</button>

4
wagtail/wagtailadmin/templates/wagtailadmin/pages/_preview_button_on_edit.html
View file

@ -1,4 +1,4 @@
<button class="action-preview {% if icon %}icon icon-view{% endif %}"
data-action="{% url 'wagtailadmin_pages_preview_on_edit' page.id %}{% if mode %}?mode={{ mode|urlencode }}{% endif %}"
data-placeholder="{% url 'wagtailadmin_pages_preview' %}"
data-action="{% url 'wagtailadmin_pages:preview_on_edit' page.id %}{% if mode %}?mode={{ mode|urlencode }}{% endif %}"
data-placeholder="{% url 'wagtailadmin_pages:preview' %}"
data-windowname="wagtail_preview_{{ page.id }}">{{ label }}</button>

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_switch.html
View file

@ -8,7 +8,7 @@
<div class="privacy-indicator {% if is_public %}public{% else %}private{% endif %}">
{% trans "Privacy" %}
{% if page_perms.can_set_view_restrictions %}
<a href="{% url 'wagtailadmin_pages_set_privacy' page.id %}" class="status-tag primary action-set-privacy">
<a href="{% url 'wagtailadmin_pages:set_privacy' page.id %}" class="status-tag primary action-set-privacy">
{# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}
<span class="label-public icon icon-view">{% trans 'Public' %}</span>
<span class="label-private icon icon-no-view">{% trans 'Private' %}</span>

4
wagtail/wagtailadmin/templates/wagtailadmin/pages/add_subpage.html
View file

@ -18,12 +18,12 @@
<li>
<div class="row row-flush">
<div class="col6">
<a href="{% url 'wagtailadmin_pages_create' content_type.app_label content_type.model parent_page.id %}" class="icon icon-plus-inverse icon-larger">{{ content_type.model_class.get_verbose_name }}</a>
<a href="{% url 'wagtailadmin_pages:create' content_type.app_label content_type.model parent_page.id %}" class="icon icon-plus-inverse icon-larger">{{ content_type.model_class.get_verbose_name }}</a>
</div>
<small class="col6" style="text-align:right">
{{ content_type|meta_description }}
<a href="{% url 'wagtailadmin_pages_type_use' content_type.app_label content_type.model %}" class="nolink">{% blocktrans with page_type=content_type.model_class.get_verbose_name %}Pages using {{ page_type }}{% endblocktrans %}</a>
<a href="{% url 'wagtailadmin_pages:type_use' content_type.app_label content_type.model %}" class="nolink">{% blocktrans with page_type=content_type.model_class.get_verbose_name %}Pages using {{ page_type }}{% endblocktrans %}</a>
</small>
</div>

4
wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_delete.html
View file

@ -21,9 +21,9 @@
{% if page.live %}
<p>{% trans "Alternatively you can unpublish the page. This removes the page from public view and you can edit or publish it again later." %}</p>
{% endif %}
<form action="{% url 'wagtailadmin_pages_delete' page.id %}" method="POST">
<form action="{% url 'wagtailadmin_pages:delete' page.id %}" method="POST">
{% csrf_token %}
<input type="submit" value="{% trans 'Delete it' %}" class="serious {% if page.live %}button-secondary{% endif %}"> {% if page.live %}<a href="{% url 'wagtailadmin_pages_unpublish' page.id %}" class="button">{% trans 'Unpublish it' %}</a>{% endif %}
<input type="submit" value="{% trans 'Delete it' %}" class="serious {% if page.live %}button-secondary{% endif %}"> {% if page.live %}<a href="{% url 'wagtailadmin_pages:unpublish' page.id %}" class="button">{% trans 'Unpublish it' %}</a>{% endif %}
</form>
</div>
{% endblock %}

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_move.html
View file

@ -13,7 +13,7 @@
<p>{% blocktrans with title=destination.title %}Are you sure you want to move this page and all of its children into '{{ title }}'?{% endblocktrans %}</p>
{% endif %}
<form action="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id destination.id %}" method="POST">
<form action="{% url 'wagtailadmin_pages:move_confirm' page_to_move.id destination.id %}" method="POST">
{% csrf_token %}
<input type="submit" value="{% trans 'Yes, move this page' %}">
</form>

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/confirm_unpublish.html
View file

@ -8,7 +8,7 @@
<div class="nice-padding">
<p>{% trans "Are you sure you want to unpublish this page?" %}</p>
<form action="{% url 'wagtailadmin_pages_unpublish' page.id %}" method="POST">
<form action="{% url 'wagtailadmin_pages:unpublish' page.id %}" method="POST">
{% csrf_token %}
<input type="submit" value="{% trans 'Yes, unpublish it' %}">
</form>

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/copy.html
View file

@ -7,7 +7,7 @@
{% include "wagtailadmin/shared/header.html" with title=copy_str subtitle=page.title icon="doc-empty-inverse" %}
<div class="nice-padding">
<form action="{% url 'wagtailadmin_pages_copy' page.id %}" method="POST">
<form action="{% url 'wagtailadmin_pages:copy' page.id %}" method="POST">
{% csrf_token %}
<ul class="fields">

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/create.html
View file

@ -17,7 +17,7 @@
</div>
</header>
<form id="page-edit-form" action="{% url 'wagtailadmin_pages_create' content_type.app_label content_type.model parent_page.id %}" method="POST">
<form id="page-edit-form" action="{% url 'wagtailadmin_pages:create' content_type.app_label content_type.model parent_page.id %}" method="POST">
{% csrf_token %}
{{ edit_handler.render_form_content }}

6
wagtail/wagtailadmin/templates/wagtailadmin/pages/edit.html
View file

@ -24,7 +24,7 @@
</div>
</header>
<form id="page-edit-form" action="{% url 'wagtailadmin_pages_edit' page.id %}" method="POST">
<form id="page-edit-form" action="{% url 'wagtailadmin_pages:edit' page.id %}" method="POST">
{% csrf_token %}
{{ edit_handler.render_form_content }}
@ -38,10 +38,10 @@
<div class="dropdown-toggle icon icon-arrow-up"></div>
<ul role="menu">
{% if page_perms.can_unpublish %}
<li><a href="{% url 'wagtailadmin_pages_unpublish' page.id %}">{% trans 'Unpublish' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:unpublish' page.id %}">{% trans 'Unpublish' %}</a></li>
{% endif %}
{% if page_perms.can_delete %}
<li><a href="{% url 'wagtailadmin_pages_delete' page.id %}" class="shortcut">{% trans 'Delete' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:delete' page.id %}" class="shortcut">{% trans 'Delete' %}</a></li>
{% endif %}
{% if page_perms.can_publish %}
<li><input type="submit" name="action-publish" value="{% trans 'Publish' %}" class="button" /></li>

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/index.html
View file

@ -58,7 +58,7 @@
// Build url
// TODO: Find better way to inject movedPageId
var url = "{% url 'wagtailadmin_pages_set_page_position' '999999' %}".replace('999999', movedPageId);
var url = "{% url 'wagtailadmin_pages:set_page_position' '999999' %}".replace('999999', movedPageId);
if (newPosition != null) {
url += '?position=' + newPosition;
}

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_list_explore.html
View file

@ -21,6 +21,6 @@
{% endblock %}
{% block no_results %}
{% url 'wagtailadmin_pages_add_subpage' parent_page.id as add_page_url%}
{% url 'wagtailadmin_pages:add_subpage' parent_page.id as add_page_url%}
<tr><td colspan="3" class="no-results-message"><p>{% trans "No pages have been created at this location." %}{% if parent_page and parent_page_perms.can_add_subpage %} {% blocktrans %}Why not <a href="{{ add_page_url }}">create one</a>?{% endblocktrans %}{% endif %}</td></tr>
{% endblock %}

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_explore.html
View file

@ -9,7 +9,7 @@ Navigation controls for the page listing in 'explore' mode
{% if page.is_navigable %}
<a href="{% url 'wagtailadmin_explore' page.id %}" class="icon text-replace icon-arrow-right" title="{% blocktrans with title=page.title %}Explore child pages of '{{ title }}'{% endblocktrans %}">{% trans "Explore" %}</a>
{% elif page_perms.can_add_subpage %}
<a href="{% url 'wagtailadmin_pages_add_subpage' page.id %}" class="icon text-replace icon-plus-inverse" title="{% blocktrans with title=page.title %}Add a child page to '{{ title }}'{% endblocktrans %}">{% trans 'Add subpage' %}</a>
<a href="{% url 'wagtailadmin_pages:add_subpage' page.id %}" class="icon text-replace icon-plus-inverse" title="{% blocktrans with title=page.title %}Add a child page to '{{ title }}'{% endblocktrans %}">{% trans 'Add subpage' %}</a>
{% endif %}
{% endif %}
</td>

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_navigation_move.html
View file

@ -6,6 +6,6 @@ Navigation controls for the page listing in 'move' mode
<td class="{% if page.can_descend %}children{% endif %}">
{% if page.can_descend %}
<a href="{% url 'wagtailadmin_pages_move_choose_destination' page_to_move.id page.id %}" class="icon text-replace icon-arrow-right navigate-pages" title="{% blocktrans with title=page.title %}Explore subpages of '{{ title }}'{% endblocktrans %}">{% trans 'Explore' %}</a>
<a href="{% url 'wagtailadmin_pages:move_choose_destination' page_to_move.id page.id %}" class="icon text-replace icon-arrow-right navigate-pages" title="{% blocktrans with title=page.title %}Explore subpages of '{{ title }}'{% endblocktrans %}">{% trans 'Explore' %}</a>
{% endif %}
</td>

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_choose.html
View file

@ -6,7 +6,7 @@ Expects a variable 'page', the page instance.
<h2>
{% if page.can_choose %}
<a class="choose-page" href="#{{ page.id }}" data-id="{{ page.id }}" data-title="{{ page.title }}" data-url="{{ page.url }}" data-edit-url="{% url 'wagtailadmin_pages_edit' page.id %}">{{ page.title }}</a>
<a class="choose-page" href="#{{ page.id }}" data-id="{{ page.id }}" data-title="{{ page.title }}" data-url="{{ page.url }}" data-edit-url="{% url 'wagtailadmin_pages:edit' page.id %}">{{ page.title }}</a>
{% else %}
{{ page.title }}
{% endif %}

16
wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_explore.html
View file

@ -4,7 +4,7 @@
<h2>
{% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
<a href="{% url 'wagtailadmin_pages_edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.title }}</a>
<a href="{% url 'wagtailadmin_pages:edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.title }}</a>
{% else %}
{{ page.title }}
{% endif %}
@ -15,27 +15,27 @@
<ul class="actions">
{% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_edit' page.id %}" class="button button-small button-secondary" title="{% trans 'Edit this page' %}">{% trans 'Edit' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:edit' page.id %}" class="button button-small button-secondary" title="{% trans 'Edit this page' %}">{% trans 'Edit' %}</a></li>
{% endif %}
{% if page.has_unpublished_changes and 'view_draft' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_view_draft' page.id %}" class="button button-small button-secondary" target="_blank">{% trans 'Draft' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:view_draft' page.id %}" class="button button-small button-secondary" target="_blank">{% trans 'Draft' %}</a></li>
{% endif %}
{% if page.live and 'view_live' not in hide_actions|default:'' %}
<li><a {% if page.url %}href="{{ page.url }}"{% endif %} class="button button-small button-secondary {% if not page.url %}disabled{% endif %}" target="_blank" {% if not page.url %}title="{% trans 'This page is published but does not exist within a configured Site, so cannot be viewed.' %}"{% endif %}>{% trans 'Live' %}</a></li>
{% endif %}
{% if page_perms.can_move and 'move' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_move' page.id %}" class="button button-small button-secondary">{% trans 'Move' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:move' page.id %}" class="button button-small button-secondary">{% trans 'Move' %}</a></li>
{% endif %}
{% if parent_page_perms.can_add_subpage and 'copy' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_copy' page.id %}" class="button button-small button-secondary">{% trans 'Copy' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:copy' page.id %}" class="button button-small button-secondary">{% trans 'Copy' %}</a></li>
{% endif %}
{% if page_perms.can_delete and 'delete' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_delete' page.id %}" class="button button-small button-secondary">{% trans 'Delete' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:delete' page.id %}" class="button button-small button-secondary">{% trans 'Delete' %}</a></li>
{% endif %}
{% if page_perms.can_unpublish and 'unpublish' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_unpublish' page.id %}" class="button button-small button-secondary">{% trans 'Unpublish' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:unpublish' page.id %}" class="button button-small button-secondary">{% trans 'Unpublish' %}</a></li>
{% endif %}
{% if page_perms.can_add_subpage and 'add_subpage' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_add_subpage' page.id %}" class="button button-small button-secondary">{% trans 'Add child page' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:add_subpage' page.id %}" class="button button-small button-secondary">{% trans 'Add child page' %}</a></li>
{% endif %}
</ul>

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_page_title_move.html
View file

@ -6,7 +6,7 @@ Expects a variable 'page', the page instance.
<h2>
{% if page.can_choose %}
<a href="{% url 'wagtailadmin_pages_move_confirm' page_to_move.id page.id %}">{{ page.title }}</a>
<a href="{% url 'wagtailadmin_pages:move_confirm' page_to_move.id page.id %}">{{ page.title }}</a>
{% else %}
{{ page.title }}
{% endif %}

14
wagtail/wagtailadmin/templates/wagtailadmin/pages/listing/_parent_page_title_explore.html
View file

@ -5,7 +5,7 @@
<h2>
{% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
<a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}">{{ parent_page.title }}</a>
<a href="{% url 'wagtailadmin_pages:edit' parent_page.id %}">{{ parent_page.title }}</a>
{% else %}
{{ parent_page.title }}
{% endif %}
@ -17,25 +17,25 @@
<ul class="actions">
{% if parent_page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_edit' parent_page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:edit' parent_page.id %}" class="button button-small button-secondary">{% trans 'Edit' %}</a></li>
{% endif %}
{% if parent_page.has_unpublished_changes and 'view_draft' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_view_draft' parent_page.id %}" class="button button-small button-secondary" target="_blank">{% trans 'Draft' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:view_draft' parent_page.id %}" class="button button-small button-secondary" target="_blank">{% trans 'Draft' %}</a></li>
{% endif %}
{% if parent_page.live and not parent_page.is_root and 'view_live' not in hide_actions|default:'' %}
<li><a {% if parent_page.url %}href="{{ parent_page.url }}"{% endif %} class="button button-small button-secondary {% if not parent_page.url %}disabled{% endif %}" target="_blank" {% if not parent_page.url %}title="{% trans 'This page is published but does not exist within a configured Site, so cannot be viewed.' %}"{% endif %}>{% trans 'Live' %}</a></li>
{% endif %}
{% if parent_page_perms.can_move and 'move' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_move' parent_page.id %}" class="button button-small button-secondary">{% trans 'Move' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:move' parent_page.id %}" class="button button-small button-secondary">{% trans 'Move' %}</a></li>
{% endif %}
{% if parent_page_perms.can_delete and 'delete' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_delete' parent_page.id %}" class="button button-small button-secondary">{% trans 'Delete' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:delete' parent_page.id %}" class="button button-small button-secondary">{% trans 'Delete' %}</a></li>
{% endif %}
{% if parent_page_perms.can_unpublish and 'unpublish' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_unpublish' parent_page.id %}" class="button button-small button-secondary">{% trans 'Unpublish' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:unpublish' parent_page.id %}" class="button button-small button-secondary">{% trans 'Unpublish' %}</a></li>
{% endif %}
{% if parent_page_perms.can_add_subpage and 'add_subpage' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_add_subpage' parent_page.id %}" class="button button-small bicolor icon white icon-plus">{% trans 'Add child page' %}</a></li>
<li><a href="{% url 'wagtailadmin_pages:add_subpage' parent_page.id %}" class="button button-small bicolor icon white icon-plus">{% trans 'Add child page' %}</a></li>
{% endif %}
</ul>

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/preview.html
View file

@ -11,6 +11,6 @@
<div id="loading-spinner-wrapper">
<div id="loading-spinner"></div>
</div>
<iframe id="preview-frame" src="{% url 'wagtailadmin_pages_preview_loading' %}"></iframe>
<iframe id="preview-frame" src="{% url 'wagtailadmin_pages:preview_loading' %}"></iframe>
</body>
</html>

4
wagtail/wagtailadmin/templates/wagtailadmin/pages/search.html
View file

@ -5,7 +5,7 @@
{% block extra_js %}
<script>
window.headerSearch = {
url: "{% url 'wagtailadmin_pages_search' %}",
url: "{% url 'wagtailadmin_pages:search' %}",
termInput: "#id_q",
targetOutput: "#page-results"
}
@ -14,7 +14,7 @@
{% block content %}
{% trans "Search" as search_str %}
{% include "wagtailadmin/shared/header.html" with title=search_str search_url="wagtailadmin_pages_search" icon="search" %}
{% include "wagtailadmin/shared/header.html" with title=search_str search_url="wagtailadmin_pages:search" icon="search" %}
<div id="page-results">
{% include "wagtailadmin/pages/search_results.html" %}

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/search_results.html
View file

@ -20,7 +20,7 @@
{% include "wagtailadmin/pages/listing/_list_explore.html" with show_parent=1 allow_navigation=0 %}
{% url 'wagtailadmin_pages_search' as pagination_base_url %}
{% url 'wagtailadmin_pages:search' as pagination_base_url %}
{% include "wagtailadmin/pages/listing/_pagination.html" with page=pages base_url=pagination_base_url query_params=pagination_query_params only %}
{% else %}
{% if query_string %}

2
wagtail/wagtailadmin/templates/wagtailadmin/pages/usage_results.html
View file

@ -3,7 +3,7 @@
{% if pages %}
{% include "wagtailadmin/pages/listing/_list_explore.html" with show_parent=1 allow_navigation=0 %}
{% url 'wagtailadmin_pages_type_use' app_name content_type.model as pagination_base_url %}
{% url 'wagtailadmin_pages:type_use' app_name content_type.model as pagination_base_url %}
{% include "wagtailadmin/pages/listing/_pagination.html" with page=pages base_url=pagination_base_url only %}
{% else %}
<p>{% trans 'No pages use' %}<em>"{{ page_class.get_verbose_name }}"</em>.</p>

2
wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_add.html
View file

@ -2,5 +2,5 @@
{% load i18n %}
{% block item_content %}
<a href="{% url 'wagtailadmin_pages_add_subpage' self.page.id %}" target="_parent" class="action icon icon-plus" title="{% trans 'Add a child page' %}">{% trans 'Add' %}</a>
<a href="{% url 'wagtailadmin_pages:add_subpage' self.page.id %}" target="_parent" class="action icon icon-plus" title="{% trans 'Add a child page' %}">{% trans 'Add' %}</a>
{% endblock %}

2
wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_approve.html
View file

@ -2,7 +2,7 @@
{% load i18n %}
{% block item_content %}
<form action="{% url 'wagtailadmin_pages_approve_moderation' self.revision.id %}" target="_parent" method="post">
<form action="{% url 'wagtailadmin_pages:approve_moderation' self.revision.id %}" target="_parent" method="post">
{% csrf_token %}
<div class="action icon icon-tick">
<input type="submit" value="{% trans 'Approve' %}" />

2
wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_edit.html
View file

@ -2,5 +2,5 @@
{% load i18n %}
{% block item_content %}
<a href="{% url 'wagtailadmin_pages_edit' self.page.id %}" target="_parent" class="action icon icon-edit">{% trans 'Edit' %}</a>
<a href="{% url 'wagtailadmin_pages:edit' self.page.id %}" target="_parent" class="action icon icon-edit">{% trans 'Edit' %}</a>
{% endblock %}

2
wagtail/wagtailadmin/templates/wagtailadmin/userbar/item_page_reject.html
View file

@ -2,7 +2,7 @@
{% load i18n %}
{% block item_content %}
<form action="{% url 'wagtailadmin_pages_reject_moderation' self.revision.id %}" target="_parent" method="post">
<form action="{% url 'wagtailadmin_pages:reject_moderation' self.revision.id %}" target="_parent" method="post">
{% csrf_token %}
<div class="action icon icon-cross">
<input type="submit" value="{% trans 'Reject' %}" />

2
wagtail/wagtailadmin/templates/wagtailadmin/widgets/page_chooser.html
View file

@ -4,4 +4,4 @@
<span class="title">{{ page.title }}</span>
{% endblock %}
{% block edit_chosen_item_url %}{% if page %}{% url 'wagtailadmin_pages_edit' page.id %}{% endif %}{% endblock %}
{% block edit_chosen_item_url %}{% if page %}{% url 'wagtailadmin_pages:edit' page.id %}{% endif %}{% endblock %}

224
wagtail/wagtailadmin/tests/test_pages_views.py
View file

@ -135,7 +135,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
self.user = self.login()
def test_add_subpage(self):
response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.root_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:add_subpage', args=(self.root_page.id, )))
self.assertEqual(response.status_code, 200)
def test_add_subpage_bad_permissions(self):
@ -147,17 +147,17 @@ class TestPageCreation(TestCase, WagtailTestUtils):
self.user.save()
# Get add subpage page
response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.root_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:add_subpage', args=(self.root_page.id, )))
# Check that the user recieved a 403 response
self.assertEqual(response.status_code, 403)
def test_add_subpage_nonexistantparent(self):
response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(100000, )))
response = self.client.get(reverse('wagtailadmin_pages:add_subpage', args=(100000, )))
self.assertEqual(response.status_code, 404)
def test_create_simplepage(self):
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id)))
self.assertEqual(response.status_code, 200)
self.assertContains(response, '<a href="#content" class="active">Content</a>')
self.assertContains(response, '<a href="#promote" class="">Promote</a>')
@ -166,7 +166,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
"""
Test that the Promote tab is not rendered for page classes that define it as empty
"""
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'standardindex', self.root_page.id)))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('tests', 'standardindex', self.root_page.id)))
self.assertEqual(response.status_code, 200)
self.assertContains(response, '<a href="#content" class="active">Content</a>')
self.assertNotContains(response, '<a href="#promote" class="">Promote</a>')
@ -175,7 +175,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
"""
Test that custom edit handlers are rendered
"""
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'standardchild', self.root_page.id)))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('tests', 'standardchild', self.root_page.id)))
self.assertEqual(response.status_code, 200)
self.assertContains(response, '<a href="#content" class="active">Content</a>')
self.assertContains(response, '<a href="#promote" class="">Promote</a>')
@ -190,7 +190,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
self.user.save()
# Get page
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id, )))
# Check that the user recieved a 403 response
self.assertEqual(response.status_code, 403)
@ -201,13 +201,13 @@ class TestPageCreation(TestCase, WagtailTestUtils):
'content': "Some content",
'slug': 'hello-world',
}
response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id)), post_data)
# Find the page and check it
page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
# Should be redirected to edit page
self.assertRedirects(response, reverse('wagtailadmin_pages_edit', args=(page.id, )))
self.assertRedirects(response, reverse('wagtailadmin_pages:edit', args=(page.id, )))
self.assertEqual(page.title, post_data['title'])
self.assertIsInstance(page, SimplePage)
@ -227,7 +227,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
'go_live_at': submittable_timestamp(go_live_at),
'expire_at': submittable_timestamp(expire_at),
}
response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id)), post_data)
# Should be redirected to explorer page
self.assertEqual(response.status_code, 302)
@ -250,7 +250,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
'go_live_at': submittable_timestamp(timezone.now() + timedelta(days=2)),
'expire_at': submittable_timestamp(timezone.now() + timedelta(days=1)),
}
response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id)), post_data)
self.assertEqual(response.status_code, 200)
@ -265,7 +265,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
'slug': 'hello-world',
'expire_at': submittable_timestamp(timezone.now() + timedelta(days=-1)),
}
response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id)), post_data)
self.assertEqual(response.status_code, 200)
@ -284,7 +284,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
'slug': 'hello-world',
'action-publish': "Publish",
}
response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id)), post_data)
# Find the page and check it
page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
@ -319,7 +319,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
'go_live_at': submittable_timestamp(go_live_at),
'expire_at': submittable_timestamp(expire_at),
}
response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id)), post_data)
# Should be redirected to explorer page
self.assertEqual(response.status_code, 302)
@ -348,7 +348,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
'slug': 'hello-world',
'action-submit': "Submit",
}
response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id)), post_data)
# Find the page and check it
page = Page.objects.get(path__startswith=self.root_page.path, slug='hello-world').specific
@ -385,7 +385,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
'slug': 'hello-world',
'action-publish': "Publish",
}
response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id)), post_data)
# Should not be redirected (as the save should fail)
self.assertEqual(response.status_code, 200)
@ -394,11 +394,11 @@ class TestPageCreation(TestCase, WagtailTestUtils):
self.assertFormError(response, 'form', 'slug', "This slug is already in use")
def test_create_nonexistantparent(self):
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', 100000)))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', 100000)))
self.assertEqual(response.status_code, 404)
def test_create_nonpagetype(self):
response = self.client.get(reverse('wagtailadmin_pages_create', args=('wagtailimages', 'image', self.root_page.id)))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('wagtailimages', 'image', self.root_page.id)))
self.assertEqual(response.status_code, 404)
def test_preview_on_create(self):
@ -408,7 +408,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
'slug': 'hello-world',
'action-submit': "Submit",
}
response = self.client.post(reverse('wagtailadmin_pages_preview_on_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:preview_on_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
# Check the response
self.assertEqual(response.status_code, 200)
@ -428,7 +428,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
'action-submit': "Submit",
'seo_title': '\t',
}
response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id)), post_data)
# Check that a form error was raised
self.assertFormError(response, 'form', 'title', "Value cannot be entirely whitespace characters")
@ -444,7 +444,7 @@ class TestPageCreation(TestCase, WagtailTestUtils):
'hello-world-hello-world-hello-world-hello-world-hello-world-hello-world',
'action-submit': "Submit",
}
response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.root_page.id)), post_data)
# Check that a form error was raised
self.assertEqual(response.status_code, 200)
@ -476,7 +476,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
def test_page_edit(self):
# Tests that the edit page loads
response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.event_page.id, )))
self.assertEqual(response.status_code, 200)
def test_page_edit_bad_permissions(self):
@ -488,7 +488,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
self.user.save()
# Get edit page
response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )))
# Check that the user recieved a 403 response
self.assertEqual(response.status_code, 403)
@ -500,10 +500,10 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'content': "Some content",
'slug': 'hello-world',
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), post_data)
# Should be redirected to edit page
self.assertRedirects(response, reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )))
self.assertRedirects(response, reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )))
# The page should have "has_unpublished_changes" flag set
child_page_new = SimplePage.objects.get(id=self.child_page.id)
@ -522,7 +522,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'content': "Some content",
'slug': 'hello-world',
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), post_data)
# Shouldn't be redirected
self.assertContains(response, "The page could not be saved as it is locked")
@ -543,7 +543,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'go_live_at': submittable_timestamp(go_live_at),
'expire_at': submittable_timestamp(expire_at),
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), post_data)
# Should be redirected to explorer page
self.assertEqual(response.status_code, 302)
@ -568,7 +568,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'go_live_at': submittable_timestamp(timezone.now() + timedelta(days=2)),
'expire_at': submittable_timestamp(timezone.now() + timedelta(days=1)),
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), post_data)
self.assertEqual(response.status_code, 200)
@ -583,7 +583,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'slug': 'hello-world',
'expire_at': submittable_timestamp(timezone.now() + timedelta(days=-1)),
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), post_data)
self.assertEqual(response.status_code, 200)
@ -610,7 +610,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'slug': 'hello-world',
'action-publish': "Publish",
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), post_data)
# Should be redirected to explorer
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -644,7 +644,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'go_live_at': submittable_timestamp(go_live_at),
'expire_at': submittable_timestamp(expire_at),
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), post_data)
# Should be redirected to explorer page
self.assertEqual(response.status_code, 302)
@ -672,7 +672,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'go_live_at': submittable_timestamp(go_live_at),
'expire_at': submittable_timestamp(expire_at),
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), post_data)
# Should be redirected to edit page
self.assertEqual(response.status_code, 302)
@ -694,7 +694,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'action-publish': "Publish",
'go_live_at': "",
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), post_data)
# Should be redirected to edit page
self.assertEqual(response.status_code, 302)
@ -718,7 +718,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'slug': 'hello-world',
'action-submit': "Submit",
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), post_data)
# Should be redirected to explorer
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -750,7 +750,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'slug': 'hello-world',
'action-submit': "Submit",
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), post_data)
# Should not be redirected (as the save should fail)
self.assertEqual(response.status_code, 200)
@ -765,7 +765,7 @@ class TestPageEdit(TestCase, WagtailTestUtils):
'slug': 'hello-world',
'action-submit': "Submit",
}
response = self.client.post(reverse('wagtailadmin_pages_preview_on_edit', args=(self.child_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:preview_on_edit', args=(self.child_page.id, )), post_data)
# Check the response
self.assertEqual(response.status_code, 200)
@ -798,7 +798,7 @@ class TestPageEditReordering(TestCase, WagtailTestUtils):
self.assertEqual(order, expected_order)
def test_order(self):
response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.event_page.id, )))
self.assertEqual(response.status_code, 200)
self.check_order(response, ['1234567', '7654321', 'abcdefg'])
@ -834,13 +834,13 @@ class TestPageEditReordering(TestCase, WagtailTestUtils):
'carousel_items-2-caption': self.event_page.carousel_items.all()[2].caption,
'carousel_items-2-ORDER': 1,
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.event_page.id, )), post_data)
# Should be redirected back to same page
self.assertRedirects(response, reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )))
self.assertRedirects(response, reverse('wagtailadmin_pages:edit', args=(self.event_page.id, )))
# Check order
response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.event_page.id, )))
self.assertEqual(response.status_code, 200)
self.check_order(response, ['abcdefg', '1234567', '7654321'])
@ -876,7 +876,7 @@ class TestPageEditReordering(TestCase, WagtailTestUtils):
'carousel_items-2-caption': self.event_page.carousel_items.all()[2].caption,
'carousel_items-2-ORDER': 1,
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.event_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.event_page.id, )), post_data)
self.assertEqual(response.status_code, 200)
self.check_order(response, ['abcdefg', '1234567', '7654321'])
@ -903,7 +903,7 @@ class TestPageDelete(TestCase, WagtailTestUtils):
self.user = self.login()
def test_page_delete(self):
response = self.client.get(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:delete', args=(self.child_page.id, )))
self.assertEqual(response.status_code, 200)
# deletion should not actually happen on GET
self.assertTrue(SimplePage.objects.filter(id=self.child_page.id).exists())
@ -917,7 +917,7 @@ class TestPageDelete(TestCase, WagtailTestUtils):
self.user.save()
# Get delete page
response = self.client.get(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:delete', args=(self.child_page.id, )))
# Check that the user recieved a 403 response
self.assertEqual(response.status_code, 403)
@ -931,7 +931,7 @@ class TestPageDelete(TestCase, WagtailTestUtils):
page_unpublished.connect(mock_handler)
# Post
response = self.client.post(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )))
response = self.client.post(reverse('wagtailadmin_pages:delete', args=(self.child_page.id, )))
# Should be redirected to explorer page
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -963,7 +963,7 @@ class TestPageDelete(TestCase, WagtailTestUtils):
page_unpublished.connect(mock_handler)
# Post
response = self.client.post(reverse('wagtailadmin_pages_delete', args=(self.child_page.id, )))
response = self.client.post(reverse('wagtailadmin_pages:delete', args=(self.child_page.id, )))
# Should be redirected to explorer page
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -997,7 +997,7 @@ class TestPageDelete(TestCase, WagtailTestUtils):
post_delete.connect(post_delete_handler)
# Post
response = self.client.post(reverse('wagtailadmin_pages_delete', args=(self.child_index.id, )))
response = self.client.post(reverse('wagtailadmin_pages:delete', args=(self.child_index.id, )))
# Should be redirected to explorer page
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -1030,7 +1030,7 @@ class TestPageSearch(TestCase, WagtailTestUtils):
self.login()
def get(self, params=None, **extra):
return self.client.get(reverse('wagtailadmin_pages_search'), params or {}, **extra)
return self.client.get(reverse('wagtailadmin_pages:search'), params or {}, **extra)
def test_view(self):
response = self.get()
@ -1091,7 +1091,7 @@ class TestPageMove(TestCase, WagtailTestUtils):
self.user = self.login()
def test_page_move(self):
response = self.client.get(reverse('wagtailadmin_pages_move', args=(self.test_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:move', args=(self.test_page.id, )))
self.assertEqual(response.status_code, 200)
def test_page_move_bad_permissions(self):
@ -1103,17 +1103,17 @@ class TestPageMove(TestCase, WagtailTestUtils):
self.user.save()
# Get move page
response = self.client.get(reverse('wagtailadmin_pages_move', args=(self.test_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:move', args=(self.test_page.id, )))
# Check that the user recieved a 403 response
self.assertEqual(response.status_code, 403)
def test_page_move_confirm(self):
response = self.client.get(reverse('wagtailadmin_pages_move_confirm', args=(self.test_page.id, self.section_b.id)))
response = self.client.get(reverse('wagtailadmin_pages:move_confirm', args=(self.test_page.id, self.section_b.id)))
self.assertEqual(response.status_code, 200)
def test_page_set_page_position(self):
response = self.client.get(reverse('wagtailadmin_pages_set_page_position', args=(self.test_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:set_page_position', args=(self.test_page.id, )))
self.assertEqual(response.status_code, 200)
@ -1149,7 +1149,7 @@ class TestPageCopy(TestCase, WagtailTestUtils):
self.user = self.login()
def test_page_copy(self):
response = self.client.get(reverse('wagtailadmin_pages_copy', args=(self.test_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:copy', args=(self.test_page.id, )))
# Check response
self.assertEqual(response.status_code, 200)
@ -1177,7 +1177,7 @@ class TestPageCopy(TestCase, WagtailTestUtils):
'new_parent_page': str(self.test_page.id),
'copy_subpages': False,
}
response = self.client.post(reverse('wagtailadmin_pages_copy', args=(self.test_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:copy', args=(self.test_page.id, )), post_data)
# Check that the user received a 403 response
self.assertEqual(response.status_code, 403)
@ -1190,7 +1190,7 @@ class TestPageCopy(TestCase, WagtailTestUtils):
'copy_subpages': False,
'publish_copies': False,
}
response = self.client.post(reverse('wagtailadmin_pages_copy', args=(self.test_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:copy', args=(self.test_page.id, )), post_data)
# Check that the user was redirected to the parents explore page
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -1222,7 +1222,7 @@ class TestPageCopy(TestCase, WagtailTestUtils):
'copy_subpages': True,
'publish_copies': False,
}
response = self.client.post(reverse('wagtailadmin_pages_copy', args=(self.test_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:copy', args=(self.test_page.id, )), post_data)
# Check that the user was redirected to the parents explore page
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -1266,7 +1266,7 @@ class TestPageCopy(TestCase, WagtailTestUtils):
'copy_subpages': True,
'publish_copies': True,
}
response = self.client.post(reverse('wagtailadmin_pages_copy', args=(self.test_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:copy', args=(self.test_page.id, )), post_data)
# Check that the user was redirected to the parents explore page
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -1310,7 +1310,7 @@ class TestPageCopy(TestCase, WagtailTestUtils):
'copy_subpages': False,
'publish_copies': False,
}
response = self.client.post(reverse('wagtailadmin_pages_copy', args=(self.test_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:copy', args=(self.test_page.id, )), post_data)
# Check that the user was redirected to the new parents explore page
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.test_child_page.id, )))
@ -1331,7 +1331,7 @@ class TestPageCopy(TestCase, WagtailTestUtils):
'new_parent_page': str(self.root_page.id),
'copy_subpages': False,
}
response = self.client.post(reverse('wagtailadmin_pages_copy', args=(self.test_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:copy', args=(self.test_page.id, )), post_data)
# Should not be redirected (as the save should fail)
self.assertEqual(response.status_code, 200)
@ -1349,7 +1349,7 @@ class TestPageCopy(TestCase, WagtailTestUtils):
'new_parent_page': str(self.test_child_page.id),
'copy_subpages': False,
}
response = self.client.post(reverse('wagtailadmin_pages_copy', args=(self.test_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:copy', args=(self.test_page.id, )), post_data)
# Check that the user was redirected to the parents explore page
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.test_child_page.id, )))
@ -1362,7 +1362,7 @@ class TestPageCopy(TestCase, WagtailTestUtils):
'new_parent_page': str(self.root_page.id),
'copy_subpages': False,
}
response = self.client.post(reverse('wagtailadmin_pages_copy', args=(self.test_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:copy', args=(self.test_page.id, )), post_data)
# Should not be redirected (as the save should fail)
self.assertEqual(response.status_code, 200)
@ -1379,7 +1379,7 @@ class TestPageCopy(TestCase, WagtailTestUtils):
self.user.save()
# Get copy page
response = self.client.get(reverse('wagtailadmin_pages_copy', args=(self.test_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:copy', args=(self.test_page.id, )))
# The user should have access to the copy page
self.assertEqual(response.status_code, 200)
@ -1406,7 +1406,7 @@ class TestPageCopy(TestCase, WagtailTestUtils):
'copy_subpages': True,
'publish_copies': True,
}
response = self.client.post(reverse('wagtailadmin_pages_copy', args=(self.test_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:copy', args=(self.test_page.id, )), post_data)
# Check that the user was redirected to the parents explore page
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -1458,7 +1458,7 @@ class TestPageUnpublish(TestCase, WagtailTestUtils):
This tests that the unpublish view responds with an unpublish confirm page
"""
# Get unpublish page
response = self.client.get(reverse('wagtailadmin_pages_unpublish', args=(self.page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:unpublish', args=(self.page.id, )))
# Check that the user recieved an unpublish confirm page
self.assertEqual(response.status_code, 200)
@ -1469,7 +1469,7 @@ class TestPageUnpublish(TestCase, WagtailTestUtils):
This tests that the unpublish view returns an error if the page id is invalid
"""
# Get unpublish page
response = self.client.get(reverse('wagtailadmin_pages_unpublish', args=(12345, )))
response = self.client.get(reverse('wagtailadmin_pages:unpublish', args=(12345, )))
# Check that the user recieved a 404 response
self.assertEqual(response.status_code, 404)
@ -1486,7 +1486,7 @@ class TestPageUnpublish(TestCase, WagtailTestUtils):
self.user.save()
# Get unpublish page
response = self.client.get(reverse('wagtailadmin_pages_unpublish', args=(self.page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:unpublish', args=(self.page.id, )))
# Check that the user recieved a 403 response
self.assertEqual(response.status_code, 403)
@ -1500,7 +1500,7 @@ class TestPageUnpublish(TestCase, WagtailTestUtils):
page_unpublished.connect(mock_handler)
# Post to the unpublish page
response = self.client.post(reverse('wagtailadmin_pages_unpublish', args=(self.page.id, )))
response = self.client.post(reverse('wagtailadmin_pages:unpublish', args=(self.page.id, )))
# Should be redirected to explorer page
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -1549,7 +1549,7 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils):
page_published.connect(mock_handler)
# Post
response = self.client.post(reverse('wagtailadmin_pages_approve_moderation', args=(self.revision.id, )))
response = self.client.post(reverse('wagtailadmin_pages:approve_moderation', args=(self.revision.id, )))
# Check that the user was redirected to the dashboard
self.assertRedirects(response, reverse('wagtailadmin_home'))
@ -1572,7 +1572,7 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils):
self.page.title = "Goodbye world!"
self.page.save_revision(user=self.submitter, submitted_for_moderation=False)
response = self.client.post(reverse('wagtailadmin_pages_approve_moderation', args=(self.revision.id, )))
response = self.client.post(reverse('wagtailadmin_pages:approve_moderation', args=(self.revision.id, )))
# Check that the user was redirected to the dashboard
self.assertRedirects(response, reverse('wagtailadmin_home'))
@ -1590,7 +1590,7 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils):
This tests that the approve moderation view handles invalid revision ids correctly
"""
# Post
response = self.client.post(reverse('wagtailadmin_pages_approve_moderation', args=(12345, )))
response = self.client.post(reverse('wagtailadmin_pages:approve_moderation', args=(12345, )))
# Check that the user recieved a 404 response
self.assertEqual(response.status_code, 404)
@ -1607,7 +1607,7 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils):
self.user.save()
# Post
response = self.client.post(reverse('wagtailadmin_pages_approve_moderation', args=(self.revision.id, )))
response = self.client.post(reverse('wagtailadmin_pages:approve_moderation', args=(self.revision.id, )))
# Check that the user recieved a 403 response
self.assertEqual(response.status_code, 403)
@ -1617,7 +1617,7 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils):
This posts to the reject moderation view and checks that the page was rejected
"""
# Post
response = self.client.post(reverse('wagtailadmin_pages_reject_moderation', args=(self.revision.id, )))
response = self.client.post(reverse('wagtailadmin_pages:reject_moderation', args=(self.revision.id, )))
# Check that the user was redirected to the dashboard
self.assertRedirects(response, reverse('wagtailadmin_home'))
@ -1633,7 +1633,7 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils):
This tests that the reject moderation view handles invalid revision ids correctly
"""
# Post
response = self.client.post(reverse('wagtailadmin_pages_reject_moderation', args=(12345, )))
response = self.client.post(reverse('wagtailadmin_pages:reject_moderation', args=(12345, )))
# Check that the user recieved a 404 response
self.assertEqual(response.status_code, 404)
@ -1650,13 +1650,13 @@ class TestApproveRejectModeration(TestCase, WagtailTestUtils):
self.user.save()
# Post
response = self.client.post(reverse('wagtailadmin_pages_reject_moderation', args=(self.revision.id, )))
response = self.client.post(reverse('wagtailadmin_pages:reject_moderation', args=(self.revision.id, )))
# Check that the user recieved a 403 response
self.assertEqual(response.status_code, 403)
def test_preview_for_moderation(self):
response = self.client.get(reverse('wagtailadmin_pages_preview_for_moderation', args=(self.revision.id, )))
response = self.client.get(reverse('wagtailadmin_pages:preview_for_moderation', args=(self.revision.id, )))
# Check response
self.assertEqual(response.status_code, 200)
@ -1672,7 +1672,7 @@ class TestContentTypeUse(TestCase, WagtailTestUtils):
def test_content_type_use(self):
# Get use of event page
response = self.client.get(reverse('wagtailadmin_pages_type_use', args=('tests', 'eventpage')))
response = self.client.get(reverse('wagtailadmin_pages:type_use', args=('tests', 'eventpage')))
# Check response
self.assertEqual(response.status_code, 200)
@ -1713,7 +1713,7 @@ class TestSubpageBusinessRules(TestCase, WagtailTestUtils):
self.login()
def test_standard_subpage(self):
add_subpage_url = reverse('wagtailadmin_pages_add_subpage', args=(self.standard_index.id, ))
add_subpage_url = reverse('wagtailadmin_pages:add_subpage', args=(self.standard_index.id, ))
# explorer should contain a link to 'add child page'
response = self.client.get(reverse('wagtailadmin_explore', args=(self.standard_index.id, )))
@ -1730,7 +1730,7 @@ class TestSubpageBusinessRules(TestCase, WagtailTestUtils):
self.assertNotContains(response, BusinessChild.get_verbose_name())
def test_business_subpage(self):
add_subpage_url = reverse('wagtailadmin_pages_add_subpage', args=(self.business_index.id, ))
add_subpage_url = reverse('wagtailadmin_pages:add_subpage', args=(self.business_index.id, ))
# explorer should contain a link to 'add child page'
response = self.client.get(reverse('wagtailadmin_explore', args=(self.business_index.id, )))
@ -1746,7 +1746,7 @@ class TestSubpageBusinessRules(TestCase, WagtailTestUtils):
self.assertContains(response, BusinessChild.get_verbose_name())
def test_business_child_subpage(self):
add_subpage_url = reverse('wagtailadmin_pages_add_subpage', args=(self.business_child.id, ))
add_subpage_url = reverse('wagtailadmin_pages:add_subpage', args=(self.business_child.id, ))
# explorer should not contain a link to 'add child page', as this page doesn't accept subpages
response = self.client.get(reverse('wagtailadmin_explore', args=(self.business_child.id, )))
@ -1754,30 +1754,30 @@ class TestSubpageBusinessRules(TestCase, WagtailTestUtils):
self.assertNotContains(response, add_subpage_url)
# this also means that fetching add_subpage is blocked at the permission-check level
response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.business_child.id, )))
response = self.client.get(reverse('wagtailadmin_pages:add_subpage', args=(self.business_child.id, )))
self.assertEqual(response.status_code, 403)
def test_cannot_add_invalid_subpage_type(self):
# cannot add StandardChild as a child of BusinessIndex, as StandardChild is not present in subpage_types
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'standardchild', self.business_index.id)))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('tests', 'standardchild', self.business_index.id)))
self.assertEqual(response.status_code, 403)
# likewise for BusinessChild which has an empty subpage_types list
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'standardchild', self.business_child.id)))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('tests', 'standardchild', self.business_child.id)))
self.assertEqual(response.status_code, 403)
# cannot add BusinessChild to StandardIndex, as BusinessChild restricts is parent page types
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'businesschild', self.standard_index.id)))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('tests', 'businesschild', self.standard_index.id)))
self.assertEqual(response.status_code, 403)
# but we can add a BusinessChild to BusinessIndex
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'businesschild', self.business_index.id)))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('tests', 'businesschild', self.business_index.id)))
self.assertEqual(response.status_code, 200)
def test_not_prompted_for_page_type_when_only_one_choice(self):
response = self.client.get(reverse('wagtailadmin_pages_add_subpage', args=(self.business_subindex.id, )))
response = self.client.get(reverse('wagtailadmin_pages:add_subpage', args=(self.business_subindex.id, )))
# BusinessChild is the only valid subpage type of BusinessSubIndex, so redirect straight there
self.assertRedirects(response, reverse('wagtailadmin_pages_create', args=('tests', 'businesschild', self.business_subindex.id)))
self.assertRedirects(response, reverse('wagtailadmin_pages:create', args=('tests', 'businesschild', self.business_subindex.id)))
class TestNotificationPreferences(TestCase, WagtailTestUtils):
@ -1817,7 +1817,7 @@ class TestNotificationPreferences(TestCase, WagtailTestUtils):
}
def submit(self):
return self.client.post(reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )), self.post_data)
return self.client.post(reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )), self.post_data)
def silent_submit(self):
"""
@ -1827,10 +1827,10 @@ class TestNotificationPreferences(TestCase, WagtailTestUtils):
self.revision = self.child_page.get_latest_revision()
def approve(self):
return self.client.post(reverse('wagtailadmin_pages_approve_moderation', args=(self.revision.id, )))
return self.client.post(reverse('wagtailadmin_pages:approve_moderation', args=(self.revision.id, )))
def reject(self):
return self.client.post(reverse('wagtailadmin_pages_reject_moderation', args=(self.revision.id, )))
return self.client.post(reverse('wagtailadmin_pages:reject_moderation', args=(self.revision.id, )))
def test_vanilla_profile(self):
# Check that the vanilla profile has rejected notifications on
@ -1927,7 +1927,7 @@ class TestLocking(TestCase, WagtailTestUtils):
self.root_page.add_child(instance=self.child_page)
def test_lock_post(self):
response = self.client.post(reverse('wagtailadmin_pages_lock', args=(self.child_page.id, )))
response = self.client.post(reverse('wagtailadmin_pages:lock', args=(self.child_page.id, )))
# Check response
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -1936,7 +1936,7 @@ class TestLocking(TestCase, WagtailTestUtils):
self.assertTrue(Page.objects.get(id=self.child_page.id).locked)
def test_lock_get(self):
response = self.client.get(reverse('wagtailadmin_pages_lock', args=(self.child_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:lock', args=(self.child_page.id, )))
# Check response
self.assertEqual(response.status_code, 405)
@ -1949,7 +1949,7 @@ class TestLocking(TestCase, WagtailTestUtils):
self.child_page.locked = True
self.child_page.save()
response = self.client.post(reverse('wagtailadmin_pages_lock', args=(self.child_page.id, )))
response = self.client.post(reverse('wagtailadmin_pages:lock', args=(self.child_page.id, )))
# Check response
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -1958,18 +1958,18 @@ class TestLocking(TestCase, WagtailTestUtils):
self.assertTrue(Page.objects.get(id=self.child_page.id).locked)
def test_lock_post_with_good_redirect(self):
response = self.client.post(reverse('wagtailadmin_pages_lock', args=(self.child_page.id, )), {
'next': reverse('wagtailadmin_pages_edit', args=(self.child_page.id, ))
response = self.client.post(reverse('wagtailadmin_pages:lock', args=(self.child_page.id, )), {
'next': reverse('wagtailadmin_pages:edit', args=(self.child_page.id, ))
})
# Check response
self.assertRedirects(response, reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )))
self.assertRedirects(response, reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )))
# Check that the page is locked
self.assertTrue(Page.objects.get(id=self.child_page.id).locked)
def test_lock_post_with_bad_redirect(self):
response = self.client.post(reverse('wagtailadmin_pages_lock', args=(self.child_page.id, )), {
response = self.client.post(reverse('wagtailadmin_pages:lock', args=(self.child_page.id, )), {
'next': 'http://www.google.co.uk'
})
@ -1980,7 +1980,7 @@ class TestLocking(TestCase, WagtailTestUtils):
self.assertTrue(Page.objects.get(id=self.child_page.id).locked)
def test_lock_post_bad_page(self):
response = self.client.post(reverse('wagtailadmin_pages_lock', args=(9999, )))
response = self.client.post(reverse('wagtailadmin_pages:lock', args=(9999, )))
# Check response
self.assertEqual(response.status_code, 404)
@ -1996,7 +1996,7 @@ class TestLocking(TestCase, WagtailTestUtils):
)
self.user.save()
response = self.client.post(reverse('wagtailadmin_pages_lock', args=(self.child_page.id, )))
response = self.client.post(reverse('wagtailadmin_pages:lock', args=(self.child_page.id, )))
# Check response
self.assertEqual(response.status_code, 403)
@ -2009,7 +2009,7 @@ class TestLocking(TestCase, WagtailTestUtils):
self.child_page.locked = True
self.child_page.save()
response = self.client.post(reverse('wagtailadmin_pages_unlock', args=(self.child_page.id, )))
response = self.client.post(reverse('wagtailadmin_pages:unlock', args=(self.child_page.id, )))
# Check response
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -2022,7 +2022,7 @@ class TestLocking(TestCase, WagtailTestUtils):
self.child_page.locked = True
self.child_page.save()
response = self.client.get(reverse('wagtailadmin_pages_unlock', args=(self.child_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:unlock', args=(self.child_page.id, )))
# Check response
self.assertEqual(response.status_code, 405)
@ -2031,7 +2031,7 @@ class TestLocking(TestCase, WagtailTestUtils):
self.assertTrue(Page.objects.get(id=self.child_page.id).locked)
def test_unlock_post_already_unlocked(self):
response = self.client.post(reverse('wagtailadmin_pages_unlock', args=(self.child_page.id, )))
response = self.client.post(reverse('wagtailadmin_pages:unlock', args=(self.child_page.id, )))
# Check response
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -2044,12 +2044,12 @@ class TestLocking(TestCase, WagtailTestUtils):
self.child_page.locked = True
self.child_page.save()
response = self.client.post(reverse('wagtailadmin_pages_unlock', args=(self.child_page.id, )), {
'next': reverse('wagtailadmin_pages_edit', args=(self.child_page.id, ))
response = self.client.post(reverse('wagtailadmin_pages:unlock', args=(self.child_page.id, )), {
'next': reverse('wagtailadmin_pages:edit', args=(self.child_page.id, ))
})
# Check response
self.assertRedirects(response, reverse('wagtailadmin_pages_edit', args=(self.child_page.id, )))
self.assertRedirects(response, reverse('wagtailadmin_pages:edit', args=(self.child_page.id, )))
# Check that the page is unlocked
self.assertFalse(Page.objects.get(id=self.child_page.id).locked)
@ -2059,7 +2059,7 @@ class TestLocking(TestCase, WagtailTestUtils):
self.child_page.locked = True
self.child_page.save()
response = self.client.post(reverse('wagtailadmin_pages_unlock', args=(self.child_page.id, )), {
response = self.client.post(reverse('wagtailadmin_pages:unlock', args=(self.child_page.id, )), {
'next': 'http://www.google.co.uk'
})
@ -2074,7 +2074,7 @@ class TestLocking(TestCase, WagtailTestUtils):
self.child_page.locked = True
self.child_page.save()
response = self.client.post(reverse('wagtailadmin_pages_unlock', args=(9999, )))
response = self.client.post(reverse('wagtailadmin_pages:unlock', args=(9999, )))
# Check response
self.assertEqual(response.status_code, 404)
@ -2094,7 +2094,7 @@ class TestLocking(TestCase, WagtailTestUtils):
self.child_page.locked = True
self.child_page.save()
response = self.client.post(reverse('wagtailadmin_pages_unlock', args=(self.child_page.id, )))
response = self.client.post(reverse('wagtailadmin_pages:unlock', args=(self.child_page.id, )))
# Check response
self.assertEqual(response.status_code, 403)
@ -2125,7 +2125,7 @@ class TestIssue197(TestCase, WagtailTestUtils):
'tags': "hello, world",
'action-publish': "Publish",
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.tagged_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.tagged_page.id, )), post_data)
# Should be redirected to explorer
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))
@ -2159,7 +2159,7 @@ class TestChildRelationsOnSuperclass(TestCase, WagtailTestUtils):
self.login()
def test_get_create_form(self):
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'standardindex', self.root_page.id)))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('tests', 'standardindex', self.root_page.id)))
self.assertEqual(response.status_code, 200)
# Response should include an advert_placements formset labelled Adverts
self.assertContains(response, "Adverts")
@ -2176,19 +2176,19 @@ class TestChildRelationsOnSuperclass(TestCase, WagtailTestUtils):
'advert_placements-0-colour': 'yellow',
'advert_placements-0-id': '',
}
response = self.client.post(reverse('wagtailadmin_pages_create', args=('tests', 'standardindex', self.root_page.id)), post_data)
response = self.client.post(reverse('wagtailadmin_pages:create', args=('tests', 'standardindex', self.root_page.id)), post_data)
# Find the page and check it
page = Page.objects.get(path__startswith=self.root_page.path, slug='new-index').specific
# Should be redirected to edit page
self.assertRedirects(response, reverse('wagtailadmin_pages_edit', args=(page.id, )))
self.assertRedirects(response, reverse('wagtailadmin_pages:edit', args=(page.id, )))
self.assertEqual(page.advert_placements.count(), 1)
self.assertEqual(page.advert_placements.first().advert.text, 'test_advert')
def test_get_edit_form(self):
response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.index_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.index_page.id, )))
self.assertEqual(response.status_code, 200)
# Response should include an advert_placements formset labelled Adverts
@ -2213,7 +2213,7 @@ class TestChildRelationsOnSuperclass(TestCase, WagtailTestUtils):
'advert_placements-1-id': '',
'action-publish': "Publish",
}
response = self.client.post(reverse('wagtailadmin_pages_edit', args=(self.index_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:edit', args=(self.index_page.id, )), post_data)
# Should be redirected to explorer
self.assertRedirects(response, reverse('wagtailadmin_explore', args=(self.root_page.id, )))

18
wagtail/wagtailadmin/tests/test_privacy.py
View file

@ -36,7 +36,7 @@ class TestSetPrivacyView(TestCase, WagtailTestUtils):
"""
This tests that a blank form is returned when a user opens the set_privacy view on a public page
"""
response = self.client.get(reverse('wagtailadmin_pages_set_privacy', args=(self.public_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:set_privacy', args=(self.public_page.id, )))
# Check response
self.assertEqual(response.status_code, 200)
@ -50,7 +50,7 @@ class TestSetPrivacyView(TestCase, WagtailTestUtils):
"""
This tests that the restriction type and password fields as set correctly when a user opens the set_privacy view on a public page
"""
response = self.client.get(reverse('wagtailadmin_pages_set_privacy', args=(self.private_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:set_privacy', args=(self.private_page.id, )))
# Check response
self.assertEqual(response.status_code, 200)
@ -65,7 +65,7 @@ class TestSetPrivacyView(TestCase, WagtailTestUtils):
"""
This tests that the set_privacy view tells the user that the password restriction has been applied to an ancestor
"""
response = self.client.get(reverse('wagtailadmin_pages_set_privacy', args=(self.private_child_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:set_privacy', args=(self.private_child_page.id, )))
# Check response
self.assertEqual(response.status_code, 200)
@ -80,7 +80,7 @@ class TestSetPrivacyView(TestCase, WagtailTestUtils):
'restriction_type': 'password',
'password': 'helloworld',
}
response = self.client.post(reverse('wagtailadmin_pages_set_privacy', args=(self.public_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:set_privacy', args=(self.public_page.id, )), post_data)
# Check response
self.assertEqual(response.status_code, 200)
@ -100,7 +100,7 @@ class TestSetPrivacyView(TestCase, WagtailTestUtils):
'restriction_type': 'password',
'password': '',
}
response = self.client.post(reverse('wagtailadmin_pages_set_privacy', args=(self.public_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:set_privacy', args=(self.public_page.id, )), post_data)
# Check response
self.assertEqual(response.status_code, 200)
@ -116,7 +116,7 @@ class TestSetPrivacyView(TestCase, WagtailTestUtils):
'restriction_type': 'none',
'password': '',
}
response = self.client.post(reverse('wagtailadmin_pages_set_privacy', args=(self.private_page.id, )), post_data)
response = self.client.post(reverse('wagtailadmin_pages:set_privacy', args=(self.private_page.id, )), post_data)
# Check response
self.assertEqual(response.status_code, 200)
@ -222,7 +222,7 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
"""
This tests that the privacy indicator on the public pages edit view is set to "PUBLIC"
"""
response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.public_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.public_page.id, )))
# Check the response
self.assertEqual(response.status_code, 200)
@ -236,7 +236,7 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
"""
This tests that the privacy indicator on the private pages edit view is set to "PRIVATE"
"""
response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.private_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.private_page.id, )))
# Check the response
self.assertEqual(response.status_code, 200)
@ -250,7 +250,7 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
"""
This tests that the privacy indicator on the private child pages edit view is set to "PRIVATE"
"""
response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.private_child_page.id, )))
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.private_child_page.id, )))
# Check the response
self.assertEqual(response.status_code, 200)

4
wagtail/wagtailadmin/tests/test_userbar.py
View file

@ -79,7 +79,7 @@ class TestUserbarAddLink(TestCase, WagtailTestUtils):
response = self.client.get(reverse('wagtailadmin_userbar_frontend', args=(self.event_index.id, )))
# page allows subpages, so the 'add page' button should show
expected_url = reverse('wagtailadmin_pages_add_subpage', args=(self.event_index.id, ))
expected_url = reverse('wagtailadmin_pages:add_subpage', args=(self.event_index.id, ))
expected_link = '<a href="%s" target="_parent" class="action icon icon-plus" title="Add a child page">Add</a>' % expected_url
self.assertContains(response, expected_link)
@ -87,7 +87,7 @@ class TestUserbarAddLink(TestCase, WagtailTestUtils):
response = self.client.get(reverse('wagtailadmin_userbar_frontend', args=(self.business_child.id, )))
# page disallows subpages, so the 'add page' button shouldn't show
expected_url = reverse('wagtailadmin_pages_add_subpage', args=(self.business_index.id, ))
expected_url = reverse('wagtailadmin_pages:add_subpage', args=(self.business_index.id, ))
expected_link = '<a href="%s" target="_parent" class="action icon icon-plus" title="Add a child page">Add</a>' % expected_url
self.assertNotContains(response, expected_link)

4
wagtail/wagtailadmin/tests/tests.py
View file

@ -44,13 +44,13 @@ class TestEditorHooks(TestCase, WagtailTestUtils):
self.login()
def test_editor_css_and_js_hooks_on_add(self):
response = self.client.get(reverse('wagtailadmin_pages_create', args=('tests', 'simplepage', self.homepage.id)))
response = self.client.get(reverse('wagtailadmin_pages:create', args=('tests', 'simplepage', self.homepage.id)))
self.assertEqual(response.status_code, 200)
self.assertContains(response, '<link rel="stylesheet" href="/path/to/my/custom.css">')
self.assertContains(response, '<script src="/path/to/my/custom.js"></script>')
def test_editor_css_and_js_hooks_on_edit(self):
response = self.client.get(reverse('wagtailadmin_pages_edit', args=(self.homepage.id, )))
response = self.client.get(reverse('wagtailadmin_pages:edit', args=(self.homepage.id, )))
self.assertEqual(response.status_code, 200)
self.assertContains(response, '<link rel="stylesheet" href="/path/to/my/custom.css">')
self.assertContains(response, '<script src="/path/to/my/custom.js"></script>')

52
wagtail/wagtailadmin/urls.py
View file

@ -1,4 +1,4 @@
from django.conf.urls import url
from django.conf.urls import url, include
from django.contrib.auth.decorators import permission_required
from django.contrib.auth import views as django_auth_views
from django.views.decorators.cache import cache_control
@ -16,42 +16,46 @@ urlpatterns = [
url(r'^explorer-nav/$', pages.explorer_nav, name='wagtailadmin_explorer_nav'),
# TODO: Move into wagtailadmin_pages namespace
url(r'^pages/$', pages.index, name='wagtailadmin_explore_root'),
url(r'^pages/(\d+)/$', pages.index, name='wagtailadmin_explore'),
url(r'^pages/new/(\w+)/(\w+)/(\d+)/$', pages.create, name='wagtailadmin_pages_create'),
url(r'^pages/new/(\w+)/(\w+)/(\d+)/preview/$', pages.preview_on_create, name='wagtailadmin_pages_preview_on_create'),
url(r'^pages/usage/(\w+)/(\w+)/$', pages.content_type_use, name='wagtailadmin_pages_type_use'),
url(r'^pages/', include([
url(r'^new/(\w+)/(\w+)/(\d+)/$', pages.create, name='create'),
url(r'^new/(\w+)/(\w+)/(\d+)/preview/$', pages.preview_on_create, name='preview_on_create'),
url(r'^usage/(\w+)/(\w+)/$', pages.content_type_use, name='type_use'),
url(r'^pages/(\d+)/edit/$', pages.edit, name='wagtailadmin_pages_edit'),
url(r'^pages/(\d+)/edit/preview/$', pages.preview_on_edit, name='wagtailadmin_pages_preview_on_edit'),
url(r'^(\d+)/edit/$', pages.edit, name='edit'),
url(r'^(\d+)/edit/preview/$', pages.preview_on_edit, name='preview_on_edit'),
url(r'^pages/preview/$', pages.preview, name='wagtailadmin_pages_preview'),
url(r'^pages/preview_loading/$', pages.preview_loading, name='wagtailadmin_pages_preview_loading'),
url(r'^preview/$', pages.preview, name='preview'),
url(r'^preview_loading/$', pages.preview_loading, name='preview_loading'),
url(r'^pages/(\d+)/view_draft/$', pages.view_draft, name='wagtailadmin_pages_view_draft'),
url(r'^pages/(\d+)/add_subpage/$', pages.add_subpage, name='wagtailadmin_pages_add_subpage'),
url(r'^pages/(\d+)/delete/$', pages.delete, name='wagtailadmin_pages_delete'),
url(r'^pages/(\d+)/unpublish/$', pages.unpublish, name='wagtailadmin_pages_unpublish'),
url(r'^(\d+)/view_draft/$', pages.view_draft, name='view_draft'),
url(r'^(\d+)/add_subpage/$', pages.add_subpage, name='add_subpage'),
url(r'^(\d+)/delete/$', pages.delete, name='delete'),
url(r'^(\d+)/unpublish/$', pages.unpublish, name='unpublish'),
url(r'^pages/search/$', pages.search, name='wagtailadmin_pages_search'),
url(r'^search/$', pages.search, name='search'),
url(r'^pages/(\d+)/move/$', pages.move_choose_destination, name='wagtailadmin_pages_move'),
url(r'^pages/(\d+)/move/(\d+)/$', pages.move_choose_destination, name='wagtailadmin_pages_move_choose_destination'),
url(r'^pages/(\d+)/move/(\d+)/confirm/$', pages.move_confirm, name='wagtailadmin_pages_move_confirm'),
url(r'^pages/(\d+)/set_position/$', pages.set_page_position, name='wagtailadmin_pages_set_page_position'),
url(r'^(\d+)/move/$', pages.move_choose_destination, name='move'),
url(r'^(\d+)/move/(\d+)/$', pages.move_choose_destination, name='move_choose_destination'),
url(r'^(\d+)/move/(\d+)/confirm/$', pages.move_confirm, name='move_confirm'),
url(r'^(\d+)/set_position/$', pages.set_page_position, name='set_page_position'),
url(r'^pages/(\d+)/copy/$', pages.copy, name='wagtailadmin_pages_copy'),
url(r'^(\d+)/copy/$', pages.copy, name='copy'),
url(r'^pages/moderation/(\d+)/approve/$', pages.approve_moderation, name='wagtailadmin_pages_approve_moderation'),
url(r'^pages/moderation/(\d+)/reject/$', pages.reject_moderation, name='wagtailadmin_pages_reject_moderation'),
url(r'^pages/moderation/(\d+)/preview/$', pages.preview_for_moderation, name='wagtailadmin_pages_preview_for_moderation'),
url(r'^moderation/(\d+)/approve/$', pages.approve_moderation, name='approve_moderation'),
url(r'^moderation/(\d+)/reject/$', pages.reject_moderation, name='reject_moderation'),
url(r'^moderation/(\d+)/preview/$', pages.preview_for_moderation, name='preview_for_moderation'),
url(r'^pages/(\d+)/privacy/$', page_privacy.set_privacy, name='wagtailadmin_pages_set_privacy'),
url(r'^(\d+)/privacy/$', page_privacy.set_privacy, name='set_privacy'),
url(r'^pages/(\d+)/lock/$', pages.lock, name='wagtailadmin_pages_lock'),
url(r'^pages/(\d+)/unlock/$', pages.unlock, name='wagtailadmin_pages_unlock'),
url(r'^(\d+)/lock/$', pages.lock, name='lock'),
url(r'^(\d+)/unlock/$', pages.unlock, name='unlock'),
], namespace='wagtailadmin_pages')),
# TODO: Move into wagtailadmin_pages namespace
url(r'^choose-page/$', chooser.browse, name='wagtailadmin_choose_page'),
url(r'^choose-page/(\d+)/$', chooser.browse, name='wagtailadmin_choose_page_child'),
url(r'^choose-page/search/$', chooser.search, name='wagtailadmin_choose_page_search'),

26
wagtail/wagtailadmin/views/pages.py
View file

@ -79,7 +79,7 @@ def add_subpage(request, parent_page_id):
# Only one page type is available - redirect straight to the create form rather than
# making the user choose
content_type = page_types[0]
return redirect('wagtailadmin_pages_create', content_type.app_label, content_type.model, parent_page.id)
return redirect('wagtailadmin_pages:create', content_type.app_label, content_type.model, parent_page.id)
return render(request, 'wagtailadmin/pages/add_subpage.html', {
'parent_page': parent_page,
@ -176,12 +176,12 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_
if is_publishing:
messages.success(request, _("Page '{0}' created and published.").format(page.title), buttons=[
messages.button(page.url, _('View live')),
messages.button(reverse('wagtailadmin_pages_edit', args=(page.id,)), _('Edit'))
messages.button(reverse('wagtailadmin_pages:edit', args=(page.id,)), _('Edit'))
])
elif is_submitting:
messages.success(request, _("Page '{0}' created and submitted for moderation.").format(page.title), buttons=[
messages.button(reverse('wagtailadmin_pages_view_draft', args=(page.id,)), _('View draft')),
messages.button(reverse('wagtailadmin_pages_edit', args=(page.id,)), _('Edit'))
messages.button(reverse('wagtailadmin_pages:view_draft', args=(page.id,)), _('View draft')),
messages.button(reverse('wagtailadmin_pages:edit', args=(page.id,)), _('Edit'))
])
send_notification(page.get_latest_revision().id, 'submitted', request.user.id)
else:
@ -197,7 +197,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_
return redirect('wagtailadmin_explore', page.get_parent().id)
else:
# Just saving - remain on edit page for further edits
return redirect('wagtailadmin_pages_edit', page.id)
return redirect('wagtailadmin_pages:edit', page.id)
else:
messages.error(request, _("The page could not be created due to validation errors"))
edit_handler = edit_handler_class(instance=page, form=form)
@ -256,12 +256,12 @@ def edit(request, page_id):
if is_publishing:
messages.success(request, _("Page '{0}' published.").format(page.title), buttons=[
messages.button(page.url, _('View live')),
messages.button(reverse('wagtailadmin_pages_edit', args=(page_id,)), _('Edit'))
messages.button(reverse('wagtailadmin_pages:edit', args=(page_id,)), _('Edit'))
])
elif is_submitting:
messages.success(request, _("Page '{0}' submitted for moderation.").format(page.title), buttons=[
messages.button(reverse('wagtailadmin_pages_view_draft', args=(page_id,)), _('View draft')),
messages.button(reverse('wagtailadmin_pages_edit', args=(page_id,)), _('Edit'))
messages.button(reverse('wagtailadmin_pages:view_draft', args=(page_id,)), _('View draft')),
messages.button(reverse('wagtailadmin_pages:edit', args=(page_id,)), _('Edit'))
])
send_notification(page.get_latest_revision().id, 'submitted', request.user.id)
else:
@ -277,7 +277,7 @@ def edit(request, page_id):
return redirect('wagtailadmin_explore', page.get_parent().id)
else:
# Just saving - remain on edit page for further edits
return redirect('wagtailadmin_pages_edit', page.id)
return redirect('wagtailadmin_pages:edit', page.id)
else:
if page.locked:
messages.error(request, _("The page could not be saved as it is locked"))
@ -494,7 +494,7 @@ def unpublish(request, page_id):
page.unpublish()
messages.success(request, _("Page '{0}' unpublished.").format(page.title), buttons=[
messages.button(reverse('wagtailadmin_pages_edit', args=(page.id,)), _('Edit'))
messages.button(reverse('wagtailadmin_pages:edit', args=(page.id,)), _('Edit'))
])
return redirect('wagtailadmin_explore', page.get_parent().id)
@ -546,7 +546,7 @@ def move_confirm(request, page_to_move_id, destination_id):
page_to_move.move(destination, pos='last-child')
messages.success(request, _("Page '{0}' moved.").format(page_to_move.title), buttons=[
messages.button(reverse('wagtailadmin_pages_edit', args=(page_to_move.id,)), _('Edit'))
messages.button(reverse('wagtailadmin_pages:edit', args=(page_to_move.id,)), _('Edit'))
])
return redirect('wagtailadmin_explore', destination.id)
@ -733,7 +733,7 @@ def approve_moderation(request, revision_id):
revision.approve_moderation()
messages.success(request, _("Page '{0}' published.").format(revision.page.title), buttons=[
messages.button(revision.page.url, _('View live')),
messages.button(reverse('wagtailadmin_pages_edit', args=(revision.page.id,)), _('Edit'))
messages.button(reverse('wagtailadmin_pages:edit', args=(revision.page.id,)), _('Edit'))
])
send_notification(revision.id, 'approved', request.user.id)
@ -752,7 +752,7 @@ def reject_moderation(request, revision_id):
if request.method == 'POST':
revision.reject_moderation()
messages.success(request, _("Page '{0}' rejected for publication.").format(revision.page.title), buttons=[
messages.button(reverse('wagtailadmin_pages_edit', args=(revision.page.id,)), _('Edit'))
messages.button(reverse('wagtailadmin_pages:edit', args=(revision.page.id,)), _('Edit'))
])
send_notification(revision.id, 'rejected', request.user.id)

16
wagtail/wagtaildocs/admin_urls.py
View file

@ -3,13 +3,13 @@ from wagtail.wagtaildocs.views import documents, chooser
urlpatterns = [
url(r'^$', documents.index, name='wagtaildocs_index'),
url(r'^add/$', documents.add, name='wagtaildocs_add_document'),
url(r'^edit/(\d+)/$', documents.edit, name='wagtaildocs_edit_document'),
url(r'^delete/(\d+)/$', documents.delete, name='wagtaildocs_delete_document'),
url(r'^$', documents.index, name='index'),
url(r'^add/$', documents.add, name='add_document'),
url(r'^edit/(\d+)/$', documents.edit, name='edit_document'),
url(r'^delete/(\d+)/$', documents.delete, name='delete_document'),
url(r'^chooser/$', chooser.chooser, name='wagtaildocs_chooser'),
url(r'^chooser/(\d+)/$', chooser.document_chosen, name='wagtaildocs_document_chosen'),
url(r'^chooser/upload/$', chooser.chooser_upload, name='wagtaildocs_chooser_upload'),
url(r'^usage/(\d+)/$', documents.usage, name='wagtaildocs_document_usage'),
url(r'^chooser/$', chooser.chooser, name='chooser'),
url(r'^chooser/(\d+)/$', chooser.document_chosen, name='document_chosen'),
url(r'^chooser/upload/$', chooser.chooser_upload, name='chooser_upload'),
url(r'^usage/(\d+)/$', documents.usage, name='document_usage'),
]

2
wagtail/wagtaildocs/models.py
View file

@ -55,7 +55,7 @@ class Document(models.Model, TagSearchable):
@property
def usage_url(self):
return reverse('wagtaildocs_document_usage',
return reverse('wagtaildocs:document_usage',
args=(self.id,))
def is_editable_by_user(self, user):

4
wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html
View file

@ -12,7 +12,7 @@
<div class="tab-content">
<section id="search" class="{% if not uploadform.errors %}active {% endif %}nice-padding">
<form class="document-search search-bar" action="{% url 'wagtaildocs_chooser' %}" method="GET">
<form class="document-search search-bar" action="{% url 'wagtaildocs:chooser' %}" method="GET">
<ul class="fields">
{% for field in searchform %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
@ -26,7 +26,7 @@
</section>
{% if uploadform %}
<section id="upload" class="{% if uploadform.errors %}active {% endif %}nice-padding">
<form class="document-upload" action="{% url 'wagtaildocs_chooser_upload' %}" method="POST" enctype="multipart/form-data">
<form class="document-upload" action="{% url 'wagtaildocs:chooser_upload' %}" method="POST" enctype="multipart/form-data">
{% csrf_token %}
<ul class="fields">
{% for field in uploadform %}

2
wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html
View file

@ -16,7 +16,7 @@
{% include "wagtailadmin/shared/header.html" with title=add_str icon="doc-full-inverse" %}
<div class="nice-padding">
<form action="{% url 'wagtaildocs_add_document' %}" method="POST" enctype="multipart/form-data">
<form action="{% url 'wagtaildocs:add_document' %}" method="POST" enctype="multipart/form-data">
{% csrf_token %}
<ul class="fields">
{% for field in form %}

2
wagtail/wagtaildocs/templates/wagtaildocs/documents/confirm_delete.html
View file

@ -8,7 +8,7 @@
<div class="nice-padding">
<p>{% trans "Are you sure you want to delete this document?" %}</p>
<form action="{% url 'wagtaildocs_delete_document' document.id %}" method="POST">
<form action="{% url 'wagtaildocs:delete_document' document.id %}" method="POST">
{% csrf_token %}
<input type="submit" value='{% trans "Yes, delete" %}' class="serious" />
</form>

4
wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html
View file

@ -18,7 +18,7 @@
<div class="row row-flush nice-padding">
<div class="col10 divider-after">
<form action="{% url 'wagtaildocs_edit_document' document.id %}" method="POST" enctype="multipart/form-data">
<form action="{% url 'wagtaildocs:edit_document' document.id %}" method="POST" enctype="multipart/form-data">
{% csrf_token %}
<ul class="fields">
{% for field in form %}
@ -28,7 +28,7 @@
{% include "wagtailadmin/shared/field_as_li.html" %}
{% endif %}
{% endfor %}
<li><input type="submit" value="{% trans 'Save' %}" /> <a href="{% url 'wagtaildocs_delete_document' document.id %}" class="button button-secondary no">{% trans "Delete document" %}</a></li>
<li><input type="submit" value="{% trans 'Save' %}" /> <a href="{% url 'wagtaildocs:delete_document' document.id %}" class="button button-secondary no">{% trans "Delete document" %}</a></li>
</ul>
</form>
</div>

4
wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html
View file

@ -5,7 +5,7 @@
{% block extra_js %}
<script>
window.headerSearch = {
url: "{% url 'wagtaildocs_index' %}",
url: "{% url 'wagtaildocs:index' %}",
termInput: "#id_q",
targetOutput: "#document-results"
}
@ -15,7 +15,7 @@
{% block content %}
{% trans "Documents" as doc_str %}
{% trans "Add a document" as add_doc_str %}
{% include "wagtailadmin/shared/header.html" with title=doc_str add_link="wagtaildocs_add_document" icon="doc-full-inverse" add_text=add_doc_str search_url="wagtaildocs_index" %}
{% include "wagtailadmin/shared/header.html" with title=doc_str add_link="wagtaildocs:add_document" icon="doc-full-inverse" add_text=add_doc_str search_url="wagtaildocs:index" %}
<div class="nice-padding">
<div id="document-results" class="documents">

8
wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html
View file

@ -7,7 +7,7 @@
<tr class="table-headers">
<th>
{% if not is_searching %}
<a href="{% url 'wagtaildocs_index' %}{% if not ordering == "title" %}?ordering=title{% endif %}" class="icon icon-arrow-down-after {% if ordering == "title" %}teal{% endif %}">
<a href="{% url 'wagtaildocs:index' %}{% if not ordering == "title" %}?ordering=title{% endif %}" class="icon icon-arrow-down-after {% if ordering == "title" %}teal{% endif %}">
{% trans "Title" %}
</a>
{% else %}
@ -17,7 +17,7 @@
<th>{% trans "File" %}</th>
<th>
{% if not is_searching %}
<a href="{% url 'wagtaildocs_index' %}{% if not ordering == "-created_at" %}?ordering=-created_at{% endif %}" class="icon icon-arrow-down-after {% if ordering == "-created_at" %}teal{% endif %}">
<a href="{% url 'wagtaildocs:index' %}{% if not ordering == "-created_at" %}?ordering=-created_at{% endif %}" class="icon icon-arrow-down-after {% if ordering == "-created_at" %}teal{% endif %}">
{% trans "Uploaded" %}
</a>
{% else %}
@ -31,9 +31,9 @@
<tr>
<td class="title">
{% if choosing %}
<h2><a href="{% url 'wagtaildocs_document_chosen' doc.id %}" class="document-choice">{{ doc.title }}</a></h2>
<h2><a href="{% url 'wagtaildocs:document_chosen' doc.id %}" class="document-choice">{{ doc.title }}</a></h2>
{% else %}
<h2><a href="{% url 'wagtaildocs_edit_document' doc.id %}">{{ doc.title }}</a></h2>
<h2><a href="{% url 'wagtaildocs:edit_document' doc.id %}">{{ doc.title }}</a></h2>
{% endif %}
</td>
<td><a href="{{ doc.url }}" class="nolink">{{ doc.filename }}</a></td>

4
wagtail/wagtaildocs/templates/wagtaildocs/documents/results.html
View file

@ -12,12 +12,12 @@
{% include "wagtaildocs/documents/list.html" %}
{% include "wagtailadmin/shared/pagination_nav.html" with items=documents is_searching=is_searching linkurl="wagtaildocs_index" %}
{% include "wagtailadmin/shared/pagination_nav.html" with items=documents is_searching=is_searching linkurl="wagtaildocs:index" %}
{% else %}
{% if is_searching %}
<p>{% blocktrans %}Sorry, no documents match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
{% else %}
{% url 'wagtaildocs_add_document' as wagtaildocs_add_document_url %}
{% url 'wagtaildocs:add_document' as wagtaildocs_add_document_url %}
<p>{% blocktrans %}You haven't uploaded any documents. Why not <a href="{{ wagtaildocs_add_document_url }}">upload one now</a>?{% endblocktrans %}</p>
{% endif %}
{% endif %}

2
wagtail/wagtaildocs/templates/wagtaildocs/documents/usage.html
View file

@ -23,7 +23,7 @@
{% for page in used_by %}
<tr>
<td class="title" valign="top">
<h2><a href="{% url 'wagtailadmin_pages_edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.title }}</a></h2>
<h2><a href="{% url 'wagtailadmin_pages:edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.title }}</a></h2>
</td>
<td>
{% if page.get_parent %}

2
wagtail/wagtaildocs/templates/wagtaildocs/homepage/site_summary_documents.html
View file

@ -1,7 +1,7 @@
{% load i18n wagtailadmin_tags %}
<li class="icon icon-doc-full-inverse">
<a href="{% url 'wagtaildocs_index' %}">
<a href="{% url 'wagtaildocs:index' %}">
{% blocktrans count counter=total_docs with total_docs|intcomma as total %}
<span>{{ total }}</span> Document
{% plural %}

2
wagtail/wagtaildocs/templates/wagtaildocs/widgets/document_chooser.html
View file

@ -5,4 +5,4 @@
<span class="title">{{ document.title }}</span>
{% endblock %}
{% block edit_chosen_item_url %}{% if document %}{% url 'wagtaildocs_edit_document' document.id %}{% endif %}{% endblock %}
{% block edit_chosen_item_url %}{% if document %}{% url 'wagtaildocs:edit_document' document.id %}{% endif %}{% endblock %}

66
wagtail/wagtaildocs/tests.py
View file

@ -62,12 +62,12 @@ class TestDocumentIndexView(TestCase, WagtailTestUtils):
self.login()
def test_simple(self):
response = self.client.get(reverse('wagtaildocs_index'))
response = self.client.get(reverse('wagtaildocs:index'))
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtaildocs/documents/index.html')
def test_search(self):
response = self.client.get(reverse('wagtaildocs_index'), {'q': "Hello"})
response = self.client.get(reverse('wagtaildocs:index'), {'q': "Hello"})
self.assertEqual(response.status_code, 200)
self.assertEqual(response.context['query_string'], "Hello")
@ -79,7 +79,7 @@ class TestDocumentIndexView(TestCase, WagtailTestUtils):
def test_pagination(self):
self.make_docs()
response = self.client.get(reverse('wagtaildocs_index'), {'p': 2})
response = self.client.get(reverse('wagtaildocs:index'), {'p': 2})
# Check response
self.assertEqual(response.status_code, 200)
@ -91,7 +91,7 @@ class TestDocumentIndexView(TestCase, WagtailTestUtils):
def test_pagination_invalid(self):
self.make_docs()
response = self.client.get(reverse('wagtaildocs_index'), {'p': 'Hello World!'})
response = self.client.get(reverse('wagtaildocs:index'), {'p': 'Hello World!'})
# Check response
self.assertEqual(response.status_code, 200)
@ -103,7 +103,7 @@ class TestDocumentIndexView(TestCase, WagtailTestUtils):
def test_pagination_out_of_range(self):
self.make_docs()
response = self.client.get(reverse('wagtaildocs_index'), {'p': 99999})
response = self.client.get(reverse('wagtaildocs:index'), {'p': 99999})
# Check response
self.assertEqual(response.status_code, 200)
@ -115,7 +115,7 @@ class TestDocumentIndexView(TestCase, WagtailTestUtils):
def test_ordering(self):
orderings = ['title', '-created_at']
for ordering in orderings:
response = self.client.get(reverse('wagtaildocs_index'), {'ordering': ordering})
response = self.client.get(reverse('wagtaildocs:index'), {'ordering': ordering})
self.assertEqual(response.status_code, 200)
@ -124,7 +124,7 @@ class TestDocumentAddView(TestCase, WagtailTestUtils):
self.login()
def test_simple(self):
response = self.client.get(reverse('wagtaildocs_add_document'))
response = self.client.get(reverse('wagtaildocs:add_document'))
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtaildocs/documents/add.html')
@ -138,10 +138,10 @@ class TestDocumentAddView(TestCase, WagtailTestUtils):
'title': "Test document",
'file': fake_file,
}
response = self.client.post(reverse('wagtaildocs_add_document'), post_data)
response = self.client.post(reverse('wagtaildocs:add_document'), post_data)
# User should be redirected back to the index
self.assertRedirects(response, reverse('wagtaildocs_index'))
self.assertRedirects(response, reverse('wagtaildocs:index'))
# Document should be created
self.assertTrue(models.Document.objects.filter(title="Test document").exists())
@ -159,7 +159,7 @@ class TestDocumentEditView(TestCase, WagtailTestUtils):
self.document = models.Document.objects.create(title="Test document", file=fake_file)
def test_simple(self):
response = self.client.get(reverse('wagtaildocs_edit_document', args=(self.document.id,)))
response = self.client.get(reverse('wagtaildocs:edit_document', args=(self.document.id,)))
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtaildocs/documents/edit.html')
@ -173,10 +173,10 @@ class TestDocumentEditView(TestCase, WagtailTestUtils):
'title': "Test document changed!",
'file': fake_file,
}
response = self.client.post(reverse('wagtaildocs_edit_document', args=(self.document.id,)), post_data)
response = self.client.post(reverse('wagtaildocs:edit_document', args=(self.document.id,)), post_data)
# User should be redirected back to the index
self.assertRedirects(response, reverse('wagtaildocs_index'))
self.assertRedirects(response, reverse('wagtaildocs:index'))
# Document title should be changed
self.assertEqual(models.Document.objects.get(id=self.document.id).title, "Test document changed!")
@ -190,7 +190,7 @@ class TestDocumentEditView(TestCase, WagtailTestUtils):
document = models.Document.objects.create(title="Test missing source document", file=fake_file)
document.file.delete(False)
response = self.client.get(reverse('wagtaildocs_edit_document', args=(document.id,)), {})
response = self.client.get(reverse('wagtaildocs:edit_document', args=(document.id,)), {})
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtaildocs/documents/edit.html')
@ -205,7 +205,7 @@ class TestDocumentDeleteView(TestCase, WagtailTestUtils):
self.document = models.Document.objects.create(title="Test document")
def test_simple(self):
response = self.client.get(reverse('wagtaildocs_delete_document', args=(self.document.id,)))
response = self.client.get(reverse('wagtaildocs:delete_document', args=(self.document.id,)))
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtaildocs/documents/confirm_delete.html')
@ -214,10 +214,10 @@ class TestDocumentDeleteView(TestCase, WagtailTestUtils):
post_data = {
'foo': 'bar'
}
response = self.client.post(reverse('wagtaildocs_delete_document', args=(self.document.id,)), post_data)
response = self.client.post(reverse('wagtaildocs:delete_document', args=(self.document.id,)), post_data)
# User should be redirected back to the index
self.assertRedirects(response, reverse('wagtaildocs_index'))
self.assertRedirects(response, reverse('wagtaildocs:index'))
# Document should be deleted
self.assertFalse(models.Document.objects.filter(id=self.document.id).exists())
@ -228,13 +228,13 @@ class TestDocumentChooserView(TestCase, WagtailTestUtils):
self.login()
def test_simple(self):
response = self.client.get(reverse('wagtaildocs_chooser'))
response = self.client.get(reverse('wagtaildocs:chooser'))
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.html')
self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.js')
def test_search(self):
response = self.client.get(reverse('wagtaildocs_chooser'), {'q': "Hello"})
response = self.client.get(reverse('wagtaildocs:chooser'), {'q': "Hello"})
self.assertEqual(response.status_code, 200)
self.assertEqual(response.context['query_string'], "Hello")
@ -246,7 +246,7 @@ class TestDocumentChooserView(TestCase, WagtailTestUtils):
def test_pagination(self):
self.make_docs()
response = self.client.get(reverse('wagtaildocs_chooser'), {'p': 2})
response = self.client.get(reverse('wagtaildocs:chooser'), {'p': 2})
# Check response
self.assertEqual(response.status_code, 200)
@ -258,7 +258,7 @@ class TestDocumentChooserView(TestCase, WagtailTestUtils):
def test_pagination_invalid(self):
self.make_docs()
response = self.client.get(reverse('wagtaildocs_chooser'), {'p': 'Hello World!'})
response = self.client.get(reverse('wagtaildocs:chooser'), {'p': 'Hello World!'})
# Check response
self.assertEqual(response.status_code, 200)
@ -270,7 +270,7 @@ class TestDocumentChooserView(TestCase, WagtailTestUtils):
def test_pagination_out_of_range(self):
self.make_docs()
response = self.client.get(reverse('wagtaildocs_chooser'), {'p': 99999})
response = self.client.get(reverse('wagtaildocs:chooser'), {'p': 99999})
# Check response
self.assertEqual(response.status_code, 200)
@ -288,7 +288,7 @@ class TestDocumentChooserChosenView(TestCase, WagtailTestUtils):
self.document = models.Document.objects.create(title="Test document")
def test_simple(self):
response = self.client.get(reverse('wagtaildocs_document_chosen', args=(self.document.id,)))
response = self.client.get(reverse('wagtaildocs:document_chosen', args=(self.document.id,)))
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtaildocs/chooser/document_chosen.js')
@ -298,7 +298,7 @@ class TestDocumentChooserUploadView(TestCase, WagtailTestUtils):
self.login()
def test_simple(self):
response = self.client.get(reverse('wagtaildocs_chooser_upload'))
response = self.client.get(reverse('wagtaildocs:chooser_upload'))
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.html')
self.assertTemplateUsed(response, 'wagtaildocs/chooser/chooser.js')
@ -313,7 +313,7 @@ class TestDocumentChooserUploadView(TestCase, WagtailTestUtils):
'title': "Test document",
'file': fake_file,
}
response = self.client.post(reverse('wagtaildocs_chooser_upload'), post_data)
response = self.client.post(reverse('wagtaildocs:chooser_upload'), post_data)
# Check that the response is a javascript file saying the document was chosen
self.assertTemplateUsed(response, 'wagtaildocs/chooser/document_chosen.js')
@ -372,7 +372,7 @@ class TestUsageCount(TestCase, WagtailTestUtils):
event_page_related_link.page = page
event_page_related_link.link_document = doc
event_page_related_link.save()
response = self.client.get(reverse('wagtaildocs_edit_document',
response = self.client.get(reverse('wagtaildocs:edit_document',
args=(1,)))
self.assertNotContains(response, 'Used 1 time')
@ -384,13 +384,13 @@ class TestUsageCount(TestCase, WagtailTestUtils):
event_page_related_link.page = page
event_page_related_link.link_document = doc
event_page_related_link.save()
response = self.client.get(reverse('wagtaildocs_edit_document',
response = self.client.get(reverse('wagtaildocs:edit_document',
args=(1,)))
self.assertContains(response, 'Used 1 time')
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_usage_count_zero_appears(self):
response = self.client.get(reverse('wagtaildocs_edit_document',
response = self.client.get(reverse('wagtaildocs:edit_document',
args=(1,)))
self.assertContains(response, 'Used 0 times')
@ -428,13 +428,13 @@ class TestGetUsage(TestCase, WagtailTestUtils):
event_page_related_link.page = page
event_page_related_link.link_document = doc
event_page_related_link.save()
response = self.client.get(reverse('wagtaildocs_document_usage',
response = self.client.get(reverse('wagtaildocs:document_usage',
args=(1,)))
self.assertContains(response, 'Christmas')
@override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True)
def test_usage_page_no_usage(self):
response = self.client.get(reverse('wagtaildocs_document_usage',
response = self.client.get(reverse('wagtaildocs:document_usage',
args=(1,)))
# There's no usage so there should be no table rows
self.assertRegex(response.content, b'<tbody>(\s|\n)*</tbody>')
@ -470,10 +470,10 @@ class TestIssue613(TestCase, WagtailTestUtils):
'file': fake_file,
}
post_data.update(params)
response = self.client.post(reverse('wagtaildocs_add_document'), post_data)
response = self.client.post(reverse('wagtaildocs:add_document'), post_data)
# User should be redirected back to the index
self.assertRedirects(response, reverse('wagtaildocs_index'))
self.assertRedirects(response, reverse('wagtaildocs:index'))
# Document should be created
doc = models.Document.objects.filter(title=post_data['title'])
@ -498,10 +498,10 @@ class TestIssue613(TestCase, WagtailTestUtils):
'file': another_fake_file,
}
post_data.update(params)
response = self.client.post(reverse('wagtaildocs_edit_document', args=(document.id,)), post_data)
response = self.client.post(reverse('wagtaildocs:edit_document', args=(document.id,)), post_data)
# User should be redirected back to the index
self.assertRedirects(response, reverse('wagtaildocs_index'))
self.assertRedirects(response, reverse('wagtaildocs:index'))
# Document should be changed
doc = models.Document.objects.filter(title=post_data['title'])

2
wagtail/wagtaildocs/views/chooser.py
View file

@ -21,7 +21,7 @@ def get_document_json(document):
return json.dumps({
'id': document.id,
'title': document.title,
'edit_link': reverse('wagtaildocs_edit_document', args=(document.id,)),
'edit_link': reverse('wagtaildocs:edit_document', args=(document.id,)),
})

12
wagtail/wagtaildocs/views/documents.py
View file

@ -90,9 +90,9 @@ def add(request):
backend.add(doc)
messages.success(request, _("Document '{0}' added.").format(doc.title), buttons=[
messages.button(reverse('wagtaildocs_edit_document', args=(doc.id,)), _('Edit'))
messages.button(reverse('wagtaildocs:edit_document', args=(doc.id,)), _('Edit'))
])
return redirect('wagtaildocs_index')
return redirect('wagtaildocs:index')
else:
messages.error(request, _("The document could not be saved due to errors."))
else:
@ -125,9 +125,9 @@ def edit(request, document_id):
backend.add(doc)
messages.success(request, _("Document '{0}' updated").format(doc.title), buttons=[
messages.button(reverse('wagtaildocs_edit_document', args=(doc.id,)), _('Edit'))
messages.button(reverse('wagtaildocs:edit_document', args=(doc.id,)), _('Edit'))
])
return redirect('wagtaildocs_index')
return redirect('wagtaildocs:index')
else:
messages.error(request, _("The document could not be saved due to errors."))
else:
@ -145,7 +145,7 @@ def edit(request, document_id):
if not filesize:
messages.error(request, _("The file could not be found. Please change the source or delete the document"), buttons=[
messages.button(reverse('wagtaildocs_delete_document', args=(doc.id,)), _('Delete'))
messages.button(reverse('wagtaildocs:delete_document', args=(doc.id,)), _('Delete'))
])
return render(request, "wagtaildocs/documents/edit.html", {
@ -164,7 +164,7 @@ def delete(request, document_id):
if request.POST:
doc.delete()
messages.success(request, _("Document '{0}' deleted.").format(doc.title))
return redirect('wagtaildocs_index')
return redirect('wagtaildocs:index')
return render(request, "wagtaildocs/documents/confirm_delete.html", {
'document': doc,

6
wagtail/wagtaildocs/wagtail_hooks.py
View file

@ -18,7 +18,7 @@ from wagtail.wagtaildocs.rich_text import DocumentLinkHandler
@hooks.register('register_admin_urls')
def register_admin_urls():
return [
url(r'^documents/', include(admin_urls)),
url(r'^documents/', include(admin_urls, namespace='wagtaildocs')),
]
@ -28,7 +28,7 @@ class DocumentsMenuItem(MenuItem):
@hooks.register('register_admin_menu_item')
def register_documents_menu_item():
return DocumentsMenuItem(_('Documents'), urlresolvers.reverse('wagtaildocs_index'), name='documents', classnames='icon icon-doc-full-inverse', order=400)
return DocumentsMenuItem(_('Documents'), urlresolvers.reverse('wagtaildocs:index'), name='documents', classnames='icon icon-doc-full-inverse', order=400)
@hooks.register('insert_editor_js')
@ -47,7 +47,7 @@ def editor_js():
registerHalloPlugin('hallowagtaildoclink');
</script>
""",
urlresolvers.reverse('wagtaildocs_chooser')
urlresolvers.reverse('wagtaildocs:chooser')
)

2
wagtail/wagtailembeds/templates/wagtailembeds/chooser/chooser.html
View file

@ -5,7 +5,7 @@
<div class="tab-content">
<section id="form" class="active nice-padding">
<form class="embed-form" action="{% url 'wagtailembeds_chooser_upload' %}" method="POST">
<form class="embed-form" action="{% url 'wagtailembeds:chooser_upload' %}" method="POST">
{% csrf_token %}
<ul class="fields">
{% for field in form %}

4
wagtail/wagtailembeds/urls.py
View file

@ -3,6 +3,6 @@ from wagtail.wagtailembeds.views import chooser
urlpatterns = [
url(r'^chooser/$', chooser.chooser, name='wagtailembeds_chooser'),
url(r'^chooser/upload/$', chooser.chooser_upload, name='wagtailembeds_chooser_upload'),
url(r'^chooser/$', chooser.chooser, name='chooser'),
url(r'^chooser/upload/$', chooser.chooser_upload, name='chooser_upload'),
]

4
wagtail/wagtailembeds/wagtail_hooks.py
View file

@ -11,7 +11,7 @@ from wagtail.wagtailembeds.rich_text import MediaEmbedHandler
@hooks.register('register_admin_urls')
def register_admin_urls():
return [
url(r'^embeds/', include(urls)),
url(r'^embeds/', include(urls, namespace='wagtailembeds')),
]
@ -26,7 +26,7 @@ def editor_js():
""",
settings.STATIC_URL,
'wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.js',
urlresolvers.reverse('wagtailembeds_chooser')
urlresolvers.reverse('wagtailembeds:chooser')
)

4
wagtail/wagtailforms/templates/wagtailforms/list_forms.html
View file

@ -12,10 +12,10 @@
{% for fp in form_pages %}
<tr>
<td class="title">
<h2><a href="{% url 'wagtailforms_list_submissions' fp.id %}">{{ fp|capfirst }}</a></h2>
<h2><a href="{% url 'wagtailforms:list_submissions' fp.id %}">{{ fp|capfirst }}</a></h2>
</td>
<td class="type">
<small><a href="{% url 'wagtailadmin_pages_edit' fp.id %}" class="nolink">{{ fp.content_type.name |capfirst }} ({{ fp.content_type.app_label }}.{{ fp.content_type.model }})</a></small>
<small><a href="{% url 'wagtailadmin_pages:edit' fp.id %}" class="nolink">{{ fp.content_type.name |capfirst }} ({{ fp.content_type.app_label }}.{{ fp.content_type.model }})</a></small>
</td>
</tr>
{% endfor %}

2
wagtail/wagtailforms/templates/wagtailforms/results_forms.html
View file

@ -2,7 +2,7 @@
{% if form_pages %}
{% include "wagtailforms/list_forms.html" %}
{% include "wagtailadmin/shared/pagination_nav.html" with items=form_pages linkurl="wagtailforms_index" %}
{% include "wagtailadmin/shared/pagination_nav.html" with items=form_pages linkurl="wagtailforms:index" %}
{% else %}
<p>{% trans "No form pages have been created." %}</p>
{% endif %}

26
wagtail/wagtailforms/tests.py
View file

@ -194,7 +194,7 @@ class TestFormsIndex(TestCase):
))
def test_forms_index(self):
response = self.client.get(reverse('wagtailforms_index'))
response = self.client.get(reverse('wagtailforms:index'))
# Check response
self.assertEqual(response.status_code, 200)
@ -205,7 +205,7 @@ class TestFormsIndex(TestCase):
self.make_form_pages()
# Get page two
response = self.client.get(reverse('wagtailforms_index'), {'p': 2})
response = self.client.get(reverse('wagtailforms:index'), {'p': 2})
# Check response
self.assertEqual(response.status_code, 200)
@ -219,7 +219,7 @@ class TestFormsIndex(TestCase):
self.make_form_pages()
# Get page two
response = self.client.get(reverse('wagtailforms_index'), {'p': 'Hello world!'})
response = self.client.get(reverse('wagtailforms:index'), {'p': 'Hello world!'})
# Check response
self.assertEqual(response.status_code, 200)
@ -233,7 +233,7 @@ class TestFormsIndex(TestCase):
self.make_form_pages()
# Get page two
response = self.client.get(reverse('wagtailforms_index'), {'p': 99999})
response = self.client.get(reverse('wagtailforms:index'), {'p': 99999})
# Check response
self.assertEqual(response.status_code, 200)
@ -246,13 +246,13 @@ class TestFormsIndex(TestCase):
# Login with as a user without permission to see forms
self.client.login(username='eventeditor', password='password')
response = self.client.get(reverse('wagtailforms_index'))
response = self.client.get(reverse('wagtailforms:index'))
# Check that the user cannot see the form page
self.assertFalse(self.form_page in response.context['form_pages'])
def test_can_see_forms_with_permission(self):
response = self.client.get(reverse('wagtailforms_index'))
response = self.client.get(reverse('wagtailforms:index'))
# Check that the user can see the form page
self.assertIn(self.form_page, response.context['form_pages'])
@ -301,7 +301,7 @@ class TestFormsSubmissions(TestCase, WagtailTestUtils):
submission.save()
def test_list_submissions(self):
response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )))
response = self.client.get(reverse('wagtailforms:list_submissions', args=(self.form_page.id, )))
# Check response
self.assertEqual(response.status_code, 200)
@ -309,7 +309,7 @@ class TestFormsSubmissions(TestCase, WagtailTestUtils):
self.assertEqual(len(response.context['data_rows']), 2)
def test_list_submissions_filtering(self):
response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'date_from': '01/01/2014'})
response = self.client.get(reverse('wagtailforms:list_submissions', args=(self.form_page.id, )), {'date_from': '01/01/2014'})
# Check response
self.assertEqual(response.status_code, 200)
@ -319,7 +319,7 @@ class TestFormsSubmissions(TestCase, WagtailTestUtils):
def test_list_submissions_pagination(self):
self.make_list_submissions()
response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'p': 2})
response = self.client.get(reverse('wagtailforms:list_submissions', args=(self.form_page.id, )), {'p': 2})
# Check response
self.assertEqual(response.status_code, 200)
@ -331,7 +331,7 @@ class TestFormsSubmissions(TestCase, WagtailTestUtils):
def test_list_submissions_pagination_invalid(self):
self.make_list_submissions()
response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'p': 'Hello World!'})
response = self.client.get(reverse('wagtailforms:list_submissions', args=(self.form_page.id, )), {'p': 'Hello World!'})
# Check response
self.assertEqual(response.status_code, 200)
@ -343,7 +343,7 @@ class TestFormsSubmissions(TestCase, WagtailTestUtils):
def test_list_submissions_pagination_out_of_range(self):
self.make_list_submissions()
response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'p': 99999})
response = self.client.get(reverse('wagtailforms:list_submissions', args=(self.form_page.id, )), {'p': 99999})
# Check response
self.assertEqual(response.status_code, 200)
@ -353,7 +353,7 @@ class TestFormsSubmissions(TestCase, WagtailTestUtils):
self.assertEqual(response.context['submissions'].number, response.context['submissions'].paginator.num_pages)
def test_list_submissions_csv_export(self):
response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'date_from': '01/01/2014', 'action': 'CSV'})
response = self.client.get(reverse('wagtailforms:list_submissions', args=(self.form_page.id, )), {'date_from': '01/01/2014', 'action': 'CSV'})
# Check response
self.assertEqual(response.status_code, 200)
@ -371,7 +371,7 @@ class TestFormsSubmissions(TestCase, WagtailTestUtils):
unicode_form_submission.submit_time = '2014-01-02T12:00:00.000Z'
unicode_form_submission.save()
response = self.client.get(reverse('wagtailforms_list_submissions', args=(self.form_page.id, )), {'date_from': '01/02/2014', 'action': 'CSV'})
response = self.client.get(reverse('wagtailforms:list_submissions', args=(self.form_page.id, )), {'date_from': '01/02/2014', 'action': 'CSV'})
# Check response
self.assertEqual(response.status_code, 200)

4
wagtail/wagtailforms/urls.py
View file

@ -4,6 +4,6 @@ from wagtail.wagtailforms import views
urlpatterns = [
url(r'^$', views.index, name='wagtailforms_index'),
url(r'^submissions/(\d+)/$', views.list_submissions, name='wagtailforms_list_submissions'),
url(r'^$', views.index, name='index'),
url(r'^submissions/(\d+)/$', views.list_submissions, name='list_submissions'),
]

7
wagtail/wagtailforms/wagtail_hooks.py
View file

@ -9,20 +9,23 @@ from wagtail.wagtailadmin.menu import MenuItem
from wagtail.wagtailforms import urls
from wagtail.wagtailforms.models import get_forms_for_user
@hooks.register('register_admin_urls')
def register_admin_urls():
return [
url(r'^forms/', include(urls)),
url(r'^forms/', include(urls, namespace='wagtailforms')),
]
class FormsMenuItem(MenuItem):
def is_shown(self, request):
# show this only if the user has permission to retrieve submissions for at least one form
return get_forms_for_user(request.user).exists()
@hooks.register('register_admin_menu_item')
def register_forms_menu_item():
return FormsMenuItem(_('Forms'), urlresolvers.reverse('wagtailforms_index'), name='forms', classnames='icon icon-form', order=700)
return FormsMenuItem(_('Forms'), urlresolvers.reverse('wagtailforms:index'), name='forms', classnames='icon icon-form', order=700)
@hooks.register('insert_editor_js')

30
wagtail/wagtailimages/admin_urls.py
View file

@ -4,21 +4,21 @@ from wagtail.wagtailimages.views import images, chooser, multiple
urlpatterns = [
url(r'^$', images.index, name='wagtailimages_index'),
url(r'^(\d+)/$', images.edit, name='wagtailimages_edit_image'),
url(r'^(\d+)/delete/$', images.delete, name='wagtailimages_delete_image'),
url(r'^(\d+)/generate_url/$', images.url_generator, name='wagtailimages_url_generator'),
url(r'^(\d+)/generate_url/(.*)/$', images.generate_url, name='wagtailimages_generate_url'),
url(r'^(\d+)/preview/(.*)/$', images.preview, name='wagtailimages_preview'),
url(r'^add/$', images.add, name='wagtailimages_add_image'),
url(r'^usage/(\d+)/$', images.usage, name='wagtailimages_image_usage'),
url(r'^$', images.index, name='index'),
url(r'^(\d+)/$', images.edit, name='edit_image'),
url(r'^(\d+)/delete/$', images.delete, name='delete_image'),
url(r'^(\d+)/generate_url/$', images.url_generator, name='url_generator'),
url(r'^(\d+)/generate_url/(.*)/$', images.generate_url, name='generate_url'),
url(r'^(\d+)/preview/(.*)/$', images.preview, name='preview'),
url(r'^add/$', images.add, name='add_image'),
url(r'^usage/(\d+)/$', images.usage, name='image_usage'),
url(r'^multiple/add/$', multiple.add, name='wagtailimages_add_multiple'),
url(r'^multiple/(\d+)/$', multiple.edit, name='wagtailimages_edit_multiple'),
url(r'^multiple/(\d+)/delete/$', multiple.delete, name='wagtailimages_delete_multiple'),
url(r'^multiple/add/$', multiple.add, name='add_multiple'),
url(r'^multiple/(\d+)/$', multiple.edit, name='edit_multiple'),
url(r'^multiple/(\d+)/delete/$', multiple.delete, name='delete_multiple'),
url(r'^chooser/$', chooser.chooser, name='wagtailimages_chooser'),
url(r'^chooser/(\d+)/$', chooser.image_chosen, name='wagtailimages_image_chosen'),
url(r'^chooser/upload/$', chooser.chooser_upload, name='wagtailimages_chooser_upload'),
url(r'^chooser/(\d+)/select_format/$', chooser.chooser_select_format, name='wagtailimages_chooser_select_format'),
url(r'^chooser/$', chooser.chooser, name='chooser'),
url(r'^chooser/(\d+)/$', chooser.image_chosen, name='image_chosen'),
url(r'^chooser/upload/$', chooser.chooser_upload, name='chooser_upload'),
url(r'^chooser/(\d+)/select_format/$', chooser.chooser_select_format, name='chooser_select_format'),
]

6
wagtail/wagtailimages/templates/wagtailimages/chooser/chooser.html
View file

@ -12,7 +12,7 @@
<div class="tab-content">
<section id="search" class="{% if not uploadform.errors %}active{% endif %} nice-padding">
<form class="image-search search-bar" action="{% url 'wagtailimages_chooser' %}{% if will_select_format %}?select_format=true{% endif %}" method="GET" autocomplete="off">
<form class="image-search search-bar" action="{% url 'wagtailimages:chooser' %}{% if will_select_format %}?select_format=true{% endif %}" method="GET" autocomplete="off">
<ul class="fields">
{% for field in searchform %}
{% include "wagtailadmin/shared/field_as_li.html" with field=field %}
@ -22,7 +22,7 @@
<li class="taglist">
<h3>{% trans 'Popular tags' %}</h3>
{% for tag in popular_tags %}
<a class="suggested-tag tag" href="{% url 'wagtailimages_index' %}?q={{ tag.name|urlencode }}">{{ tag.name }}</a>
<a class="suggested-tag tag" href="{% url 'wagtailimages:index' %}?q={{ tag.name|urlencode }}">{{ tag.name }}</a>
{% endfor %}
</li>
{% endif %}
@ -34,7 +34,7 @@
</section>
{% if uploadform %}
<section id="upload" class="{% if uploadform.errors %}active{% endif %} nice-padding">
<form class="image-upload" action="{% url 'wagtailimages_chooser_upload' %}{% if will_select_format %}?select_format=true{% endif %}" method="POST" enctype="multipart/form-data">
<form class="image-upload" action="{% url 'wagtailimages:chooser_upload' %}{% if will_select_format %}?select_format=true{% endif %}" method="POST" enctype="multipart/form-data">
{% csrf_token %}
<ul class="fields">
{% for field in uploadform %}

2
wagtail/wagtailimages/templates/wagtailimages/chooser/results.html
View file

@ -16,7 +16,7 @@
<ul class="listing horiz images chooser">
{% for image in images %}
<li>
<a class="image-choice" href="{% if will_select_format %}{% url 'wagtailimages_chooser_select_format' image.id %}{% else %}{% url 'wagtailimages_image_chosen' image.id %}{% endif %}">
<a class="image-choice" href="{% if will_select_format %}{% url 'wagtailimages:chooser_select_format' image.id %}{% else %}{% url 'wagtailimages:image_chosen' image.id %}{% endif %}">
<div class="image">{% image image max-165x165 %}</div>
<h3>{{ image.title|ellipsistrim:60 }}</h3>
</a>

4
wagtail/wagtailimages/templates/wagtailimages/chooser/select_format.html
View file

@ -8,7 +8,7 @@
{% image image max-800x600 %}
</div>
<div class="col6">
<form action="{% url 'wagtailimages_chooser_select_format' image.id %}" method="POST">
<form action="{% url 'wagtailimages:chooser_select_format' image.id %}" method="POST">
{% csrf_token %}
<ul class="fields">
{% for field in form %}
@ -18,4 +18,4 @@
</ul>
</form>
</div>
</div>
</div>

2
wagtail/wagtailimages/templates/wagtailimages/homepage/site_summary_images.html
View file

@ -1,7 +1,7 @@
{% load i18n wagtailadmin_tags %}
<li class="icon icon-image">
<a href="{% url 'wagtailimages_index' %}">
<a href="{% url 'wagtailimages:index' %}">
{% blocktrans count counter=total_images with total_images|intcomma as total %}
<span>{{ total }}</span> Image
{% plural %}

2
wagtail/wagtailimages/templates/wagtailimages/images/add.html
View file

@ -16,7 +16,7 @@
{% include "wagtailadmin/shared/header.html" with title=add_str icon="image" %}
<div class="nice-padding">
<form action="{% url 'wagtailimages_add_image' %}" method="POST" enctype="multipart/form-data">
<form action="{% url 'wagtailimages:add_image' %}" method="POST" enctype="multipart/form-data">
{% csrf_token %}
<ul class="fields">
{% for field in form %}

2
wagtail/wagtailimages/templates/wagtailimages/images/confirm_delete.html
View file

@ -14,7 +14,7 @@
</div>
<div class="col6">
<p>{% trans "Are you sure you want to delete this image?" %}</p>
<form action="{% url 'wagtailimages_delete_image' image.id %}" method="POST">
<form action="{% url 'wagtailimages:delete_image' image.id %}" method="POST">
{% csrf_token %}
<input type="submit" value="{% trans 'Yes, delete' %}" class="serious" />
</form>

6
wagtail/wagtailimages/templates/wagtailimages/images/edit.html
View file

@ -28,7 +28,7 @@
<div class="row row-flush nice-padding">
<div class="col5">
<form action="{% url 'wagtailimages_edit_image' image.id %}" method="POST" enctype="multipart/form-data">
<form action="{% url 'wagtailimages:edit_image' image.id %}" method="POST" enctype="multipart/form-data">
{% csrf_token %}
<ul class="fields">
{% for field in form %}
@ -42,7 +42,7 @@
{% endif %}
{% endfor %}
<li><input type="submit" value="{% trans 'Save' %}" /><a href="{% url 'wagtailimages_delete_image' image.id %}" class="button button-secondary no">{% trans "Delete image" %}</a></li>
<li><input type="submit" value="{% trans 'Save' %}" /><a href="{% url 'wagtailimages:delete_image' image.id %}" class="button button-secondary no">{% trans "Delete image" %}</a></li>
</ul>
</form>
</div>
@ -67,7 +67,7 @@
</div>
<div class="col2 ">
{% if url_generator_enabled %}
<a href="{% url 'wagtailimages_url_generator' image.id %}" class="button bicolor icon icon-link">{% trans "URL Generator" %}</a>
<a href="{% url 'wagtailimages:url_generator' image.id %}" class="button bicolor icon icon-link">{% trans "URL Generator" %}</a>
<hr />
{% endif %}

4
wagtail/wagtailimages/templates/wagtailimages/images/index.html
View file

@ -7,7 +7,7 @@
{% block extra_js %}
<script>
window.headerSearch = {
url: "{% url 'wagtailimages_index' %}",
url: "{% url 'wagtailimages:index' %}",
termInput: "#id_q",
targetOutput: "#image-results"
}
@ -17,7 +17,7 @@
{% block content %}
{% trans "Images" as im_str %}
{% trans "Add an image" as add_img_str %}
{% include "wagtailadmin/shared/header.html" with title=im_str add_link="wagtailimages_add_multiple" icon="image" add_text=add_img_str search_url="wagtailimages_index" %}
{% include "wagtailadmin/shared/header.html" with title=im_str add_link="wagtailimages:add_multiple" icon="image" add_text=add_img_str search_url="wagtailimages:index" %}
<div class="nice-padding">
<div id="image-results">

6
wagtail/wagtailimages/templates/wagtailimages/images/results.html
View file

@ -16,7 +16,7 @@
<ul class="listing horiz images">
{% for image in images %}
<li>
<a class="image-choice" href="{% url 'wagtailimages_edit_image' image.id %}">
<a class="image-choice" href="{% url 'wagtailimages:edit_image' image.id %}">
<div class="image">{% image image max-165x165 class="show-transparency" %}</div>
<h3>{{ image.title|ellipsistrim:60 }}</h3>
</a>
@ -24,13 +24,13 @@
{% endfor %}
</ul>
{% include "wagtailadmin/shared/pagination_nav.html" with items=images is_searching=is_searching query_string=query_string linkurl="wagtailimages_index" %}
{% include "wagtailadmin/shared/pagination_nav.html" with items=images is_searching=is_searching query_string=query_string linkurl="wagtailimages:index" %}
{% else %}
{% if is_searching %}
<p>{% blocktrans %}Sorry, no images match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
{% else %}
{% url 'wagtailimages_add_multiple' as wagtailimages_add_image_url %}
{% url 'wagtailimages:add_multiple' as wagtailimages_add_image_url %}
<p>{% blocktrans %}You've not uploaded any images. Why not <a href="{{ wagtailimages_add_image_url }}">add one now</a>?{% endblocktrans %}</p>
{% endif %}
{% endif %}

4
wagtail/wagtailimages/templates/wagtailimages/images/url_generator.html
View file

@ -9,7 +9,7 @@
{% trans "Generating URL" as title_str %}
{% include "wagtailadmin/shared/header.html" with title=title_str subtitle=image.title icon="image" %}
<div class="image-url-generator nice-padding" data-generator-url="{% url 'wagtailimages_generate_url' image.id '__filterspec__' %}">
<div class="image-url-generator nice-padding" data-generator-url="{% url 'wagtailimages:generate_url' image.id '__filterspec__' %}">
<form>
<ul class="fields">
{% include "wagtailadmin/shared/field_as_li.html" with field=form.filter_method %}
@ -41,4 +41,4 @@
<script src="{% static 'wagtailadmin/js/vendor/jquery.ba-throttle-debounce.min.js' %}"></script>
<script src="{% static 'wagtailimages/js/image-url-generator.js' %}"></script>
{% endcompress %}
{% endblock %}
{% endblock %}

2
wagtail/wagtailimages/templates/wagtailimages/images/usage.html
View file

@ -23,7 +23,7 @@
{% for page in used_by %}
<tr>
<td class="title" valign="top">
<h2><a href="{% url 'wagtailadmin_pages_edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.title }}</a></h2>
<h2><a href="{% url 'wagtailadmin_pages:edit' page.id %}" title="{% trans 'Edit this page' %}">{{ page.title }}</a></h2>
</td>
<td>
{% if page.get_parent %}

6
wagtail/wagtailimages/templates/wagtailimages/multiple/add.html
View file

@ -18,10 +18,10 @@
<p>{% trans "Drag and drop images into this area to upload immediately." %}</p>
<p>{{ help_text }}
<form action="{% url 'wagtailimages_add_multiple' %}" method="POST" enctype="multipart/form-data">
<form action="{% url 'wagtailimages:add_multiple' %}" method="POST" enctype="multipart/form-data">
<div class="replace-file-input">
<button class="bicolor icon icon-plus">{% trans "Or choose from your computer" %}</button>
<input id="fileupload" type="file" name="files[]" data-url="{% url 'wagtailimages_add_multiple' %}" multiple>
<input id="fileupload" type="file" name="files[]" data-url="{% url 'wagtailimages:add_multiple' %}" multiple>
</div>
{% csrf_token %}
</form>
@ -72,7 +72,7 @@
{% url 'wagtailadmin_tag_autocomplete' as autocomplete_url %}
<script>
window.fileupload_opts = {
simple_upload_url: "{% url 'wagtailimages_add_image' %}",
simple_upload_url: "{% url 'wagtailimages:add_image' %}",
accepted_file_types: /\.({{ allowed_extensions|join:"|" }})$/i, //must be regex
max_file_size: {{ max_filesize|stringformat:"s"|default:"null" }}, //numeric format
errormessages: {

6
wagtail/wagtailimages/templates/wagtailimages/multiple/edit_form.html
View file

@ -1,6 +1,6 @@
{% load i18n %}
<form action="{% url 'wagtailimages_edit_multiple' image.id %}" method="POST" enctype="multipart/form-data">
<form action="{% url 'wagtailimages:edit_multiple' image.id %}" method="POST" enctype="multipart/form-data">
<ul class="fields">
{% csrf_token %}
{% for field in form %}
@ -12,7 +12,7 @@
{% endfor %}
<li>
<input type="submit" value="{% trans 'Update' %}" />
<a href="{% url 'wagtailimages_delete_multiple' image.id %}" class="delete button button-secondary no">{% trans "Delete" %}</a>
<a href="{% url 'wagtailimages:delete_multiple' image.id %}" class="delete button button-secondary no">{% trans "Delete" %}</a>
</li>
</ul>
</form>
</form>

2
wagtail/wagtailimages/templates/wagtailimages/widgets/image_chooser.html
View file

@ -13,4 +13,4 @@
</div>
{% endblock %}
{% block edit_chosen_item_url %}{% if image %}{% url 'wagtailimages_edit_image' image.id %}{% endif %}{% endblock %}
{% block edit_chosen_item_url %}{% if image %}{% url 'wagtailimages:edit_image' image.id %}{% endif %}{% endblock %}

76
wagtail/wagtailimages/tests/test_admin_views.py
View file

@ -28,7 +28,7 @@ class TestImageIndexView(TestCase, WagtailTestUtils):
self.login()
def get(self, params={}):
return self.client.get(reverse('wagtailimages_index'), params)
return self.client.get(reverse('wagtailimages:index'), params)
def test_simple(self):
response = self.get()
@ -58,10 +58,10 @@ class TestImageAddView(TestCase, WagtailTestUtils):
self.login()
def get(self, params={}):
return self.client.get(reverse('wagtailimages_add_image'), params)
return self.client.get(reverse('wagtailimages:add_image'), params)
def post(self, post_data={}):
return self.client.post(reverse('wagtailimages_add_image'), post_data)
return self.client.post(reverse('wagtailimages:add_image'), post_data)
def test_simple(self):
response = self.get()
@ -75,7 +75,7 @@ class TestImageAddView(TestCase, WagtailTestUtils):
})
# Should redirect back to index
self.assertRedirects(response, reverse('wagtailimages_index'))
self.assertRedirects(response, reverse('wagtailimages:index'))
# Check that the image was created
images = Image.objects.filter(title="Test image")
@ -132,10 +132,10 @@ class TestImageEditView(TestCase, WagtailTestUtils):
)
def get(self, params={}):
return self.client.get(reverse('wagtailimages_edit_image', args=(self.image.id,)), params)
return self.client.get(reverse('wagtailimages:edit_image', args=(self.image.id,)), params)
def post(self, post_data={}):
return self.client.post(reverse('wagtailimages_edit_image', args=(self.image.id,)), post_data)
return self.client.post(reverse('wagtailimages:edit_image', args=(self.image.id,)), post_data)
def test_simple(self):
response = self.get()
@ -148,7 +148,7 @@ class TestImageEditView(TestCase, WagtailTestUtils):
})
# Should redirect back to index
self.assertRedirects(response, reverse('wagtailimages_index'))
self.assertRedirects(response, reverse('wagtailimages:index'))
# Check that the image was edited
image = Image.objects.get(id=self.image.id)
@ -167,7 +167,7 @@ class TestImageEditView(TestCase, WagtailTestUtils):
})
# Should redirect back to index
self.assertRedirects(response, reverse('wagtailimages_index'))
self.assertRedirects(response, reverse('wagtailimages:index'))
# Check that the image file size changed (assume it changed to the correct value)
image = Image.objects.get(id=self.image.id)
@ -192,10 +192,10 @@ class TestImageDeleteView(TestCase, WagtailTestUtils):
)
def get(self, params={}):
return self.client.get(reverse('wagtailimages_delete_image', args=(self.image.id,)), params)
return self.client.get(reverse('wagtailimages:delete_image', args=(self.image.id,)), params)
def post(self, post_data={}):
return self.client.post(reverse('wagtailimages_delete_image', args=(self.image.id,)), post_data)
return self.client.post(reverse('wagtailimages:delete_image', args=(self.image.id,)), post_data)
def test_simple(self):
response = self.get()
@ -208,7 +208,7 @@ class TestImageDeleteView(TestCase, WagtailTestUtils):
})
# Should redirect back to index
self.assertRedirects(response, reverse('wagtailimages_index'))
self.assertRedirects(response, reverse('wagtailimages:index'))
# Check that the image was deleted
images = Image.objects.filter(title="Test image")
@ -220,7 +220,7 @@ class TestImageChooserView(TestCase, WagtailTestUtils):
self.login()
def get(self, params={}):
return self.client.get(reverse('wagtailimages_chooser'), params)
return self.client.get(reverse('wagtailimages:chooser'), params)
def test_simple(self):
response = self.get()
@ -251,7 +251,7 @@ class TestImageChooserChosenView(TestCase, WagtailTestUtils):
)
def get(self, params={}):
return self.client.get(reverse('wagtailimages_image_chosen', args=(self.image.id,)), params)
return self.client.get(reverse('wagtailimages:image_chosen', args=(self.image.id,)), params)
def test_simple(self):
response = self.get()
@ -266,7 +266,7 @@ class TestImageChooserUploadView(TestCase, WagtailTestUtils):
self.login()
def get(self, params={}):
return self.client.get(reverse('wagtailimages_chooser_upload'), params)
return self.client.get(reverse('wagtailimages:chooser_upload'), params)
def test_simple(self):
response = self.get()
@ -275,7 +275,7 @@ class TestImageChooserUploadView(TestCase, WagtailTestUtils):
self.assertTemplateUsed(response, 'wagtailimages/chooser/chooser.js')
def test_upload(self):
response = self.client.post(reverse('wagtailimages_chooser_upload'), {
response = self.client.post(reverse('wagtailimages:chooser_upload'), {
'title': "Test image",
'file': SimpleUploadedFile('test.png', get_test_image_file().file.getvalue()),
})
@ -293,7 +293,7 @@ class TestImageChooserUploadView(TestCase, WagtailTestUtils):
self.assertEqual(image.height, 480)
def test_upload_no_file_selected(self):
response = self.client.post(reverse('wagtailimages_chooser_upload'), {
response = self.client.post(reverse('wagtailimages:chooser_upload'), {
'title': "Test image",
})
@ -323,7 +323,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
This tests that the add view responds correctly on a GET request
"""
# Send request
response = self.client.get(reverse('wagtailimages_add_multiple'))
response = self.client.get(reverse('wagtailimages:add_multiple'))
# Check response
self.assertEqual(response.status_code, 200)
@ -331,7 +331,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
@override_settings(WAGTAILIMAGES_MAX_UPLOAD_SIZE=1000)
def test_add_max_file_size_context_variables(self):
response = self.client.get(reverse('wagtailimages_add_multiple'))
response = self.client.get(reverse('wagtailimages:add_multiple'))
self.assertEqual(response.context['max_filesize'], 1000)
self.assertEqual(response.context['error_max_file_size'], "This file is too big. Maximum filesize 1000\xa0bytes.")
@ -340,7 +340,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
"""
This tests that a POST request to the add view saves the image and returns an edit form
"""
response = self.client.post(reverse('wagtailimages_add_multiple'), {
response = self.client.post(reverse('wagtailimages:add_multiple'), {
'files[]': SimpleUploadedFile('test.png', get_test_image_file().file.getvalue()),
}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
@ -370,7 +370,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
"""
This tests that only AJAX requests are allowed to POST to the add view
"""
response = self.client.post(reverse('wagtailimages_add_multiple'), {})
response = self.client.post(reverse('wagtailimages:add_multiple'), {})
# Check response
self.assertEqual(response.status_code, 400)
@ -379,7 +379,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
"""
This tests that the add view checks for a file when a user POSTs to it
"""
response = self.client.post(reverse('wagtailimages_add_multiple'), {}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
response = self.client.post(reverse('wagtailimages:add_multiple'), {}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
# Check response
self.assertEqual(response.status_code, 400)
@ -388,7 +388,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
"""
This tests that the add view checks for a file when a user POSTs to it
"""
response = self.client.post(reverse('wagtailimages_add_multiple'), {
response = self.client.post(reverse('wagtailimages:add_multiple'), {
'files[]': SimpleUploadedFile('test.png', b"This is not an image!"),
}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
@ -410,7 +410,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
This tests that a GET request to the edit view returns a 405 "METHOD NOT ALLOWED" response
"""
# Send request
response = self.client.get(reverse('wagtailimages_edit_multiple', args=(self.image.id, )))
response = self.client.get(reverse('wagtailimages:edit_multiple', args=(self.image.id, )))
# Check response
self.assertEqual(response.status_code, 405)
@ -420,7 +420,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
This tests that a POST request to the edit view edits the image
"""
# Send request
response = self.client.post(reverse('wagtailimages_edit_multiple', args=(self.image.id, )), {
response = self.client.post(reverse('wagtailimages:edit_multiple', args=(self.image.id, )), {
('image-%d-title' % self.image.id): "New title!",
('image-%d-tags' % self.image.id): "",
}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
@ -442,7 +442,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
This tests that a POST request to the edit view without AJAX returns a 400 response
"""
# Send request
response = self.client.post(reverse('wagtailimages_edit_multiple', args=(self.image.id, )), {
response = self.client.post(reverse('wagtailimages:edit_multiple', args=(self.image.id, )), {
('image-%d-title' % self.image.id): "New title!",
('image-%d-tags' % self.image.id): "",
})
@ -456,7 +456,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
and a form with the validation error indicated
"""
# Send request
response = self.client.post(reverse('wagtailimages_edit_multiple', args=(self.image.id, )), {
response = self.client.post(reverse('wagtailimages:edit_multiple', args=(self.image.id, )), {
('image-%d-title' % self.image.id): "", # Required
('image-%d-tags' % self.image.id): "",
}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
@ -482,7 +482,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
This tests that a GET request to the delete view returns a 405 "METHOD NOT ALLOWED" response
"""
# Send request
response = self.client.get(reverse('wagtailimages_delete_multiple', args=(self.image.id, )))
response = self.client.get(reverse('wagtailimages:delete_multiple', args=(self.image.id, )))
# Check response
self.assertEqual(response.status_code, 405)
@ -492,7 +492,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
This tests that a POST request to the delete view deletes the image
"""
# Send request
response = self.client.post(reverse('wagtailimages_delete_multiple', args=(self.image.id, )), HTTP_X_REQUESTED_WITH='XMLHttpRequest')
response = self.client.post(reverse('wagtailimages:delete_multiple', args=(self.image.id, )), HTTP_X_REQUESTED_WITH='XMLHttpRequest')
# Check response
self.assertEqual(response.status_code, 200)
@ -513,7 +513,7 @@ class TestMultipleImageUploader(TestCase, WagtailTestUtils):
This tests that a POST request to the delete view without AJAX returns a 400 response
"""
# Send request
response = self.client.post(reverse('wagtailimages_delete_multiple', args=(self.image.id, )))
response = self.client.post(reverse('wagtailimages:delete_multiple', args=(self.image.id, )))
# Check response
self.assertEqual(response.status_code, 400)
@ -535,7 +535,7 @@ class TestURLGeneratorView(TestCase, WagtailTestUtils):
This tests that the view responds correctly for a user with edit permissions on this image
"""
# Get
response = self.client.get(reverse('wagtailimages_url_generator', args=(self.image.id, )))
response = self.client.get(reverse('wagtailimages:url_generator', args=(self.image.id, )))
# Check response
self.assertEqual(response.status_code, 200)
@ -553,7 +553,7 @@ class TestURLGeneratorView(TestCase, WagtailTestUtils):
self.user.save()
# Get
response = self.client.get(reverse('wagtailimages_url_generator', args=(self.image.id, )))
response = self.client.get(reverse('wagtailimages:url_generator', args=(self.image.id, )))
# Check response
self.assertEqual(response.status_code, 403)
@ -575,7 +575,7 @@ class TestGenerateURLView(TestCase, WagtailTestUtils):
This tests that the view responds correctly for a user with edit permissions on this image
"""
# Get
response = self.client.get(reverse('wagtailimages_generate_url', args=(self.image.id, 'fill-800x600')))
response = self.client.get(reverse('wagtailimages:generate_url', args=(self.image.id, 'fill-800x600')))
# Check response
self.assertEqual(response.status_code, 200)
@ -592,7 +592,7 @@ class TestGenerateURLView(TestCase, WagtailTestUtils):
}
self.assertEqual(content_json['url'], expected_url)
expected_preview_url = reverse('wagtailimages_preview', args=(self.image.id, 'fill-800x600'))
expected_preview_url = reverse('wagtailimages:preview', args=(self.image.id, 'fill-800x600'))
self.assertEqual(content_json['preview_url'], expected_preview_url)
def test_get_bad_permissions(self):
@ -607,7 +607,7 @@ class TestGenerateURLView(TestCase, WagtailTestUtils):
self.user.save()
# Get
response = self.client.get(reverse('wagtailimages_generate_url', args=(self.image.id, 'fill-800x600')))
response = self.client.get(reverse('wagtailimages:generate_url', args=(self.image.id, 'fill-800x600')))
# Check response
self.assertEqual(response.status_code, 403)
@ -623,7 +623,7 @@ class TestGenerateURLView(TestCase, WagtailTestUtils):
This tests that the view gives a 404 response if a user attempts to use it with an image which doesn't exist
"""
# Get
response = self.client.get(reverse('wagtailimages_generate_url', args=(self.image.id + 1, 'fill-800x600')))
response = self.client.get(reverse('wagtailimages:generate_url', args=(self.image.id + 1, 'fill-800x600')))
# Check response
self.assertEqual(response.status_code, 404)
@ -639,7 +639,7 @@ class TestGenerateURLView(TestCase, WagtailTestUtils):
This tests that the view gives a 400 response if the user attempts to use it with an invalid filter spec
"""
# Get
response = self.client.get(reverse('wagtailimages_generate_url', args=(self.image.id, 'bad-filter-spec')))
response = self.client.get(reverse('wagtailimages:generate_url', args=(self.image.id, 'bad-filter-spec')))
# Check response
self.assertEqual(response.status_code, 400)
@ -667,7 +667,7 @@ class TestPreviewView(TestCase, WagtailTestUtils):
Test a valid GET request to the view
"""
# Get the image
response = self.client.get(reverse('wagtailimages_preview', args=(self.image.id, 'fill-800x600')))
response = self.client.get(reverse('wagtailimages:preview', args=(self.image.id, 'fill-800x600')))
# Check response
self.assertEqual(response.status_code, 200)
@ -683,7 +683,7 @@ class TestPreviewView(TestCase, WagtailTestUtils):
anyway though.
"""
# Get the image
response = self.client.get(reverse('wagtailimages_preview', args=(self.image.id, 'bad-filter-spec')))
response = self.client.get(reverse('wagtailimages:preview', args=(self.image.id, 'bad-filter-spec')))
# Check response
self.assertEqual(response.status_code, 400)

8
wagtail/wagtailimages/tests/test_models.py
View file

@ -307,10 +307,10 @@ class TestIssue613(TestCase, WagtailTestUtils):
'file': SimpleUploadedFile('test.png', get_test_image_file().file.getvalue()),
}
post_data.update(params)
response = self.client.post(reverse('wagtailimages_add_image'), post_data)
response = self.client.post(reverse('wagtailimages:add_image'), post_data)
# Should redirect back to index
self.assertRedirects(response, reverse('wagtailimages_index'))
self.assertRedirects(response, reverse('wagtailimages:index'))
# Check that the image was created
images = Image.objects.filter(title="Test image")
@ -335,10 +335,10 @@ class TestIssue613(TestCase, WagtailTestUtils):
'title': "Edited",
}
post_data.update(params)
response = self.client.post(reverse('wagtailimages_edit_image', args=(self.image.id,)), post_data)
response = self.client.post(reverse('wagtailimages:edit_image', args=(self.image.id,)), post_data)
# Should redirect back to index
self.assertRedirects(response, reverse('wagtailimages_index'))
self.assertRedirects(response, reverse('wagtailimages:index'))
# Check that the image was edited
image = Image.objects.get(id=self.image.id)

4
wagtail/wagtailimages/views/chooser.py
View file

@ -23,7 +23,7 @@ def get_image_json(image):
return json.dumps({
'id': image.id,
'edit_link': reverse('wagtailimages_edit_image', args=(image.id,)),
'edit_link': reverse('wagtailimages:edit_image', args=(image.id,)),
'title': image.title,
'preview': {
'url': preview_image.url,
@ -166,7 +166,7 @@ def chooser_select_format(request, image_id):
'format': format.name,
'alt': form.cleaned_data['alt_text'],
'class': format.classnames,
'edit_link': reverse('wagtailimages_edit_image', args=(image.id,)),
'edit_link': reverse('wagtailimages:edit_image', args=(image.id,)),
'preview': {
'url': preview_image.url,
'width': preview_image.width,

14
wagtail/wagtailimages/views/images.py
View file

@ -108,9 +108,9 @@ def edit(request, image_id):
backend.add(image)
messages.success(request, _("Image '{0}' updated.").format(image.title), buttons=[
messages.button(reverse('wagtailimages_edit_image', args=(image.id,)), _('Edit again'))
messages.button(reverse('wagtailimages:edit_image', args=(image.id,)), _('Edit again'))
])
return redirect('wagtailimages_index')
return redirect('wagtailimages:index')
else:
messages.error(request, _("The image could not be saved due to errors."))
else:
@ -133,7 +133,7 @@ def edit(request, image_id):
# Give error if image file doesn't exist
if not os.path.isfile(local_path):
messages.error(request, _("The source image file could not be found. Please change the source or delete the image.").format(image.title), buttons=[
messages.button(reverse('wagtailimages_delete_image', args=(image.id,)), _('Delete'))
messages.button(reverse('wagtailimages:delete_image', args=(image.id,)), _('Delete'))
])
return render(request, "wagtailimages/images/edit.html", {
@ -201,7 +201,7 @@ def generate_url(request, image_id, filter_spec):
site_root_url = Site.objects.first().root_url
# Generate preview url
preview_url = reverse('wagtailimages_preview', args=(image_id, filter_spec))
preview_url = reverse('wagtailimages:preview', args=(image_id, filter_spec))
return json_response({'url': site_root_url + url, 'preview_url': preview_url}, status=200)
@ -226,7 +226,7 @@ def delete(request, image_id):
if request.POST:
image.delete()
messages.success(request, _("Image '{0}' deleted.").format(image.title))
return redirect('wagtailimages_index')
return redirect('wagtailimages:index')
return render(request, "wagtailimages/images/confirm_delete.html", {
'image': image,
@ -252,9 +252,9 @@ def add(request):
backend.add(image)
messages.success(request, _("Image '{0}' added.").format(image.title), buttons=[
messages.button(reverse('wagtailimages_edit_image', args=(image.id,)), _('Edit'))
messages.button(reverse('wagtailimages:edit_image', args=(image.id,)), _('Edit'))
])
return redirect('wagtailimages_index')
return redirect('wagtailimages:index')
else:
messages.error(request, _("The image could not be created due to errors."))
else:

10
wagtail/wagtailimages/wagtail_hooks.py
View file

@ -19,7 +19,7 @@ from wagtail.wagtailimages.rich_text import ImageEmbedHandler
@hooks.register('register_admin_urls')
def register_admin_urls():
return [
url(r'^images/', include(admin_urls)),
url(r'^images/', include(admin_urls, namespace='wagtailimages', app_name='wagtailimages')),
]
@ -41,7 +41,7 @@ def check_old_style_urlconf():
# A faulty urls.py will place wagtail.wagtailimages.urls at the same path that
# wagtail.wagtailimages.admin_urls is loaded to, resulting in the wagtailimages_serve path
# being equal to wagtailimages_index followed by three arbitrary args
# being equal to wagtailimages:index followed by three arbitrary args
try:
wagtailimages_serve_path = urlresolvers.reverse('wagtailimages_serve', args=['123', '456', '789'])
except urlresolvers.NoReverseMatch:
@ -49,7 +49,7 @@ def check_old_style_urlconf():
OLD_STYLE_URLCONF_CHECK_PASSED = True
return
wagtailimages_index_path = urlresolvers.reverse('wagtailimages_index')
wagtailimages_index_path = urlresolvers.reverse('wagtailimages:index')
if wagtailimages_serve_path == wagtailimages_index_path + '123/456/789/':
raise ImproperlyConfigured("""Your urls.py contains an entry for %s that needs to be removed.
See http://wagtail.readthedocs.org/en/latest/releases/0.5.html#urlconf-entries-for-admin-images-admin-embeds-etc-need-to-be-removed"""
@ -71,7 +71,7 @@ class ImagesMenuItem(MenuItem):
@hooks.register('register_admin_menu_item')
def register_images_menu_item():
return ImagesMenuItem(_('Images'), urlresolvers.reverse('wagtailimages_index'), name='images', classnames='icon icon-image', order=300)
return ImagesMenuItem(_('Images'), urlresolvers.reverse('wagtailimages:index'), name='images', classnames='icon icon-image', order=300)
@hooks.register('insert_editor_js')
@ -90,7 +90,7 @@ def editor_js():
registerHalloPlugin('hallowagtailimage');
</script>
""",
urlresolvers.reverse('wagtailimages_chooser')
urlresolvers.reverse('wagtailimages:chooser')
)

2
wagtail/wagtailredirects/templates/wagtailredirects/add.html
View file

@ -6,7 +6,7 @@
{% trans "Add redirect" as add_red_str %}
{% include "wagtailadmin/shared/header.html" with title=add_red_str icon="redirect" %}
<form action="{% url 'wagtailredirects_add_redirect' %}" method="POST" class="nice-padding">
<form action="{% url 'wagtailredirects:add_redirect' %}" method="POST" class="nice-padding">
{% csrf_token %}
{{ edit_handler.render_form_content }}

2
wagtail/wagtailredirects/templates/wagtailredirects/confirm_delete.html
View file

@ -8,7 +8,7 @@
<div class="row row-flush nice-padding">
<p>{% trans "Are you sure you want to delete this redirect?" %}</p>
<form action="{% url 'wagtailredirects_delete_redirect' redirect.id %}" method="POST">
<form action="{% url 'wagtailredirects:delete_redirect' redirect.id %}" method="POST">
{% csrf_token %}
<input type="submit" value="{% trans 'Yes, delete' %}" class="serious" />
</form>

4
wagtail/wagtailredirects/templates/wagtailredirects/edit.html
View file

@ -6,13 +6,13 @@
{% trans "Editing" as editing_str %}
{% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=redirect.title icon="redirect" %}
<form action="{% url 'wagtailredirects_edit_redirect' redirect.id %}" method="POST" class="nice-padding">
<form action="{% url 'wagtailredirects:edit_redirect' redirect.id %}" method="POST" class="nice-padding">
{% csrf_token %}
{{ edit_handler.render_form_content }}
<div>
<input type="submit" value="{% trans 'Save' %}" />
<a href="{% url 'wagtailredirects_delete_redirect' redirect.id %}" class="button button-secondary no">{% trans "Delete redirect" %}</a>
<a href="{% url 'wagtailredirects:delete_redirect' redirect.id %}" class="button button-secondary no">{% trans "Delete redirect" %}</a>
</div>
</form>

4
wagtail/wagtailredirects/templates/wagtailredirects/index.html
View file

@ -6,7 +6,7 @@
{% block extra_js %}
<script>
window.headerSearch = {
url: "{% url 'wagtailredirects_index' %}",
url: "{% url 'wagtailredirects:index' %}",
termInput: "#id_q",
targetOutput: "#redirects-results"
}
@ -16,7 +16,7 @@
{% block content %}
{% trans "Redirects" as redirects_str %}
{% trans "Add redirect" as add_str %}
{% include "wagtailadmin/shared/header.html" with title=redirects_str icon="redirect" add_link="wagtailredirects_add_redirect" add_text=add_str search_url="wagtailredirects_index" %}
{% include "wagtailadmin/shared/header.html" with title=redirects_str icon="redirect" add_link="wagtailredirects:add_redirect" add_text=add_str search_url="wagtailredirects:index" %}
<div class="nice-padding">
<div id="redirects-results" class="redirects">

6
wagtail/wagtailredirects/templates/wagtailredirects/list.html
View file

@ -7,7 +7,7 @@
<tr>
<th class="title">
{% if not is_searching %}
<a href="{% url 'wagtailredirects_index' %}{% if not ordering == "old_path" %}?ordering=old_path{% endif %}" class="icon icon-arrow-down-after {% if ordering == "old_path" %}teal{% endif %}">
<a href="{% url 'wagtailredirects:index' %}{% if not ordering == "old_path" %}?ordering=old_path{% endif %}" class="icon icon-arrow-down-after {% if ordering == "old_path" %}teal{% endif %}">
{% trans "From" %}
</a>
{% else %}
@ -22,11 +22,11 @@
{% for redirect in redirects %}
<tr>
<td class="title">
<h2><a href="{% url 'wagtailredirects_edit_redirect' redirect.id %}" title="{% trans 'Edit this redirect' %}">{{ redirect.title }}</a></h2>
<h2><a href="{% url 'wagtailredirects:edit_redirect' redirect.id %}" title="{% trans 'Edit this redirect' %}">{{ redirect.title }}</a></h2>
</td>
<td>
{% if redirect.redirect_page %}
<a href="{% url 'wagtailadmin_pages_edit' redirect.redirect_page.id %}" class="nolink">{{ redirect.redirect_page.title }}</a>
<a href="{% url 'wagtailadmin_pages:edit' redirect.redirect_page.id %}" class="nolink">{{ redirect.redirect_page.title }}</a>
{% else %}
{{ redirect.link }}
{% endif %}

4
wagtail/wagtailredirects/templates/wagtailredirects/results.html
View file

@ -12,12 +12,12 @@
{% include "wagtailredirects/list.html" %}
{% include "wagtailadmin/shared/pagination_nav.html" with items=redirects is_searching=query_string linkurl="wagtailredirects_index" %}
{% include "wagtailadmin/shared/pagination_nav.html" with items=redirects is_searching=query_string linkurl="wagtailredirects:index" %}
{% else %}
{% if query_string %}
<p>{% blocktrans %}Sorry, no redirects match "<em>{{ query_string }}</em>"{% endblocktrans %}
{% else %}
{% url 'wagtailredirects_add_redirect' as wagtailredirects_add_redirect_url %}
{% url 'wagtailredirects:add_redirect' as wagtailredirects_add_redirect_url %}
<p>{% blocktrans %}No redirects have been created. Why not <a href="{{ wagtailredirects_add_redirect_url }}">add one</a>?{% endblocktrans %}</p>
{% endif %}
{% endif %}

20
wagtail/wagtailredirects/tests.py
View file

@ -71,7 +71,7 @@ class TestRedirectsIndexView(TestCase, WagtailTestUtils):
self.login()
def get(self, params={}):
return self.client.get(reverse('wagtailredirects_index'), params)
return self.client.get(reverse('wagtailredirects:index'), params)
def test_simple(self):
response = self.get()
@ -95,10 +95,10 @@ class TestRedirectsAddView(TestCase, WagtailTestUtils):
self.login()
def get(self, params={}):
return self.client.get(reverse('wagtailredirects_add_redirect'), params)
return self.client.get(reverse('wagtailredirects:add_redirect'), params)
def post(self, post_data={}):
return self.client.post(reverse('wagtailredirects_add_redirect'), post_data)
return self.client.post(reverse('wagtailredirects:add_redirect'), post_data)
def test_simple(self):
response = self.get()
@ -113,7 +113,7 @@ class TestRedirectsAddView(TestCase, WagtailTestUtils):
})
# Should redirect back to index
self.assertRedirects(response, reverse('wagtailredirects_index'))
self.assertRedirects(response, reverse('wagtailredirects:index'))
# Check that the redirect was created
redirects = models.Redirect.objects.filter(old_path='/test')
@ -141,10 +141,10 @@ class TestRedirectsEditView(TestCase, WagtailTestUtils):
self.login()
def get(self, params={}, redirect_id=None):
return self.client.get(reverse('wagtailredirects_edit_redirect', args=(redirect_id or self.redirect.id, )), params)
return self.client.get(reverse('wagtailredirects:edit_redirect', args=(redirect_id or self.redirect.id, )), params)
def post(self, post_data={}, redirect_id=None):
return self.client.post(reverse('wagtailredirects_edit_redirect', args=(redirect_id or self.redirect.id, )), post_data)
return self.client.post(reverse('wagtailredirects:edit_redirect', args=(redirect_id or self.redirect.id, )), post_data)
def test_simple(self):
response = self.get()
@ -162,7 +162,7 @@ class TestRedirectsEditView(TestCase, WagtailTestUtils):
})
# Should redirect back to index
self.assertRedirects(response, reverse('wagtailredirects_index'))
self.assertRedirects(response, reverse('wagtailredirects:index'))
# Check that the redirect was edited
redirects = models.Redirect.objects.filter(old_path='/test')
@ -189,10 +189,10 @@ class TestRedirectsDeleteView(TestCase, WagtailTestUtils):
self.login()
def get(self, params={}, redirect_id=None):
return self.client.get(reverse('wagtailredirects_delete_redirect', args=(redirect_id or self.redirect.id, )), params)
return self.client.get(reverse('wagtailredirects:delete_redirect', args=(redirect_id or self.redirect.id, )), params)
def post(self, post_data={}, redirect_id=None):
return self.client.post(reverse('wagtailredirects_delete_redirect', args=(redirect_id or self.redirect.id, )), post_data)
return self.client.post(reverse('wagtailredirects:delete_redirect', args=(redirect_id or self.redirect.id, )), post_data)
def test_simple(self):
response = self.get()
@ -208,7 +208,7 @@ class TestRedirectsDeleteView(TestCase, WagtailTestUtils):
})
# Should redirect back to index
self.assertRedirects(response, reverse('wagtailredirects_index'))
self.assertRedirects(response, reverse('wagtailredirects:index'))
# Check that the redirect was deleted
redirects = models.Redirect.objects.filter(old_path='/test')

8
wagtail/wagtailredirects/urls.py
View file

@ -3,8 +3,8 @@ from wagtail.wagtailredirects import views
urlpatterns = [
url(r'^$', views.index, name='wagtailredirects_index'),
url(r'^(\d+)/$', views.edit, name='wagtailredirects_edit_redirect'),
url(r'^(\d+)/delete/$', views.delete, name='wagtailredirects_delete_redirect'),
url(r'^add/$', views.add, name='wagtailredirects_add_redirect'),
url(r'^$', views.index, name='index'),
url(r'^(\d+)/$', views.edit, name='edit_redirect'),
url(r'^(\d+)/delete/$', views.delete, name='delete_redirect'),
url(r'^add/$', views.add, name='add_redirect'),
]

10
wagtail/wagtailredirects/views.py
View file

@ -70,9 +70,9 @@ def edit(request, redirect_id):
if form.is_valid():
form.save()
messages.success(request, _("Redirect '{0}' updated.").format(theredirect.title), buttons=[
messages.button(reverse('wagtailredirects_edit_redirect', args=(theredirect.id,)), _('Edit'))
messages.button(reverse('wagtailredirects:edit_redirect', args=(theredirect.id,)), _('Edit'))
])
return redirect('wagtailredirects_index')
return redirect('wagtailredirects:index')
else:
messages.error(request, _("The redirect could not be saved due to errors."))
edit_handler = REDIRECT_EDIT_HANDLER(instance=theredirect, form=form)
@ -93,7 +93,7 @@ def delete(request, redirect_id):
if request.POST:
theredirect.delete()
messages.success(request, _("Redirect '{0}' deleted.").format(theredirect.title))
return redirect('wagtailredirects_index')
return redirect('wagtailredirects:index')
return render(request, "wagtailredirects/confirm_delete.html", {
'redirect': theredirect,
@ -113,9 +113,9 @@ def add(request):
theredirect.save()
messages.success(request, _("Redirect '{0}' added.").format(theredirect.title), buttons=[
messages.button(reverse('wagtailredirects_edit_redirect', args=(theredirect.id,)), _('Edit'))
messages.button(reverse('wagtailredirects:edit_redirect', args=(theredirect.id,)), _('Edit'))
])
return redirect('wagtailredirects_index')
return redirect('wagtailredirects:index')
else:
messages.error(request, _("The redirect could not be created due to errors."))
edit_handler = REDIRECT_EDIT_HANDLER(instance=theredirect, form=form)

4
wagtail/wagtailredirects/wagtail_hooks.py
View file

@ -11,7 +11,7 @@ from wagtail.wagtailadmin.menu import MenuItem
@hooks.register('register_admin_urls')
def register_admin_urls():
return [
url(r'^redirects/', include(urls)),
url(r'^redirects/', include(urls, namespace='wagtailredirects')),
]
@ -22,4 +22,4 @@ class RedirectsMenuItem(MenuItem):
@hooks.register('register_settings_menu_item')
def register_redirects_menu_item():
return RedirectsMenuItem(_('Redirects'), urlresolvers.reverse('wagtailredirects_index'), classnames='icon icon-redirect', order=800)
return RedirectsMenuItem(_('Redirects'), urlresolvers.reverse('wagtailredirects:index'), classnames='icon icon-redirect', order=800)

2
wagtail/wagtailsearch/templates/wagtailsearch/editorspicks/list.html
View file

@ -18,7 +18,7 @@
</td>
<td>
{% for editors_pick in query.editors_picks.all %}
<a href="{% url 'wagtailadmin_pages_edit' editors_pick.page.id %}" class="nolink">{{ editors_pick.page.title }}</a>{% if not forloop.last %}, {% endif %}
<a href="{% url 'wagtailadmin_pages:edit' editors_pick.page.id %}" class="nolink">{{ editors_pick.page.title }}</a>{% if not forloop.last %}, {% endif %}
{% empty %}
{% trans "None" %}
{% endfor %}

2
wagtail/wagtailsites/templates/wagtailsites/confirm_delete.html
View file

@ -9,7 +9,7 @@
<div class="nice-padding">
<p>{% trans "Are you sure you want to delete this site?" %}</p>
<form action="{% url 'wagtailsites_delete' site.id %}" method="POST">
<form action="{% url 'wagtailsites:delete' site.id %}" method="POST">
{% csrf_token %}
<input type="submit" value="{% trans 'Yes, delete' %}" class="serious" />
</form>

2
wagtail/wagtailsites/templates/wagtailsites/create.html
View file

@ -9,7 +9,7 @@
{% trans "Add site" as add_site_str %}
{% include "wagtailadmin/shared/header.html" with title=add_site_str icon="site" %}
<form action="{% url 'wagtailsites_create' %}" method="POST">
<form action="{% url 'wagtailsites:create' %}" method="POST">
{% csrf_token %}
<div class="nice-padding">
<ul class="fields">

4
wagtail/wagtailsites/templates/wagtailsites/edit.html
View file

@ -10,7 +10,7 @@
{% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=site.hostname icon="site" %}
<div class="nice-padding">
<form action="{% url 'wagtailsites_edit' site.id %}" method="POST">
<form action="{% url 'wagtailsites:edit' site.id %}" method="POST">
{% csrf_token %}
<ul class="fields">
@ -22,7 +22,7 @@
<li>
<input type="submit" value="{% trans 'Save' %}" />
{% if perms.site.delete_site %}
<a href="{% url 'wagtailsites_delete' site.id %}" class="button button-secondary no">{% trans "Delete site" %}</a>
<a href="{% url 'wagtailsites:delete' site.id %}" class="button button-secondary no">{% trans "Delete site" %}</a>
{% endif %}
</li>
</ul>

8
wagtail/wagtailsites/templates/wagtailsites/index.html
View file

@ -5,7 +5,7 @@
{% trans "Sites" as sites_str %}
{% if perms.site.add_site %}
{% trans "Add a site" as add_a_site_str %}
{% include "wagtailadmin/shared/header.html" with title=sites_str add_link="wagtailsites_create" add_text=add_a_site_str icon="site" %}
{% include "wagtailadmin/shared/header.html" with title=sites_str add_link="wagtailsites:create" add_text=add_a_site_str icon="site" %}
{% else %}
{% include "wagtailadmin/shared/header.html" with title=sites_str icon="site" %}
{% endif %}
@ -18,9 +18,9 @@
<th class="hostname">
{% trans "Site" %}
{% if ordering == "site" %}
<a href="{% url 'wagtailsites_index' %}" class="icon icon-arrow-down-after teal"></a>
<a href="{% url 'wagtailsites:index' %}" class="icon icon-arrow-down-after teal"></a>
{% else %}
<a href="{% url 'wagtailsites_index' %}?ordering=name" class="icon icon-arrow-down-after"></a>
<a href="{% url 'wagtailsites:index' %}?ordering=name" class="icon icon-arrow-down-after"></a>
{% endif %}
</th>
<th class="port">{% trans "Port" %}</th>
@ -33,7 +33,7 @@
<tr>
<td class="hostname title">
<h2>
<a href="{% url 'wagtailsites_edit' site.id %}">{{ site.hostname }}</a>
<a href="{% url 'wagtailsites:edit' site.id %}">{{ site.hostname }}</a>
</h2>
</td>
<td class="port">{{ site.port }}</td>

Some files were not shown because too many files have changed in this diff Show more