mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add safe filter to task and workflow names on plain text notification templates to prevent escaping. Ensure plain text templates inherit from the plain text base templates, rather than html.

pull/6257/head
jacobtoppm 2020-03-31 16:06:53 +01:00 zatwierdzone przez Matt Westcott
rodzic 38629160cc
commit 3834195f79
13 zmienionych plików z 17 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
wagtail/admin/templates/wagtailadmin/notifications/task_state_approved.txt
Wyświetl plik

@ -1,7 +1,7 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load i18n %}
{% block content %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name %}The page "{{ title }}" has been approved in moderation stage "{{ task }}".{% endblocktrans %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been approved in moderation stage "{{ task }}".{% endblocktrans %}
{% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %}
{% endblock %}

2
wagtail/admin/templates/wagtailadmin/notifications/task_state_approved_subject.txt
Wyświetl plik

@ -1,3 +1,3 @@
{% load i18n %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name %}The page "{{ title }}" has been approved in "{{ task }}".{% endblocktrans %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been approved in "{{ task }}".{% endblocktrans %}

2
wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected.txt
Wyświetl plik

@ -2,6 +2,6 @@
{% load i18n %}
{% block content %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name %}The page "{{ title }}" has been rejected in moderation stage "{{ task }}".{% endblocktrans %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been rejected in moderation stage "{{ task }}".{% endblocktrans %}
{% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %}
{% endblock %}

2
wagtail/admin/templates/wagtailadmin/notifications/task_state_rejected_subject.txt
Wyświetl plik

@ -1,3 +1,3 @@
{% load i18n %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name %}The page "{{ title }}" has been rejected during "{{ task }}".{% endblocktrans %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been rejected during "{{ task }}".{% endblocktrans %}

4
wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted.txt
Wyświetl plik

@ -1,9 +1,9 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load i18n %}
{% block content %}
{% blocktrans with task=task.name title=page.get_admin_display_title|safe %}The page "{{ title }}" has been submitted for approval to moderation stage "{{ task }}".{% endblocktrans %}
{% blocktrans with task=task.name|safe title=page.get_admin_display_title|safe %}The page "{{ title }}" has been submitted for approval to moderation stage "{{ task }}".{% endblocktrans %}
{% trans "You can preview the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:workflow_preview' page.id task.id %}

2
wagtail/admin/templates/wagtailadmin/notifications/task_state_submitted_subject.txt
Wyświetl plik

@ -1,3 +1,3 @@
{% load i18n %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name %}The page "{{ title }}" has been submitted for approval in moderation stage "{{ task }}" {% endblocktrans %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name|safe %}The page "{{ title }}" has been submitted for approval in moderation stage "{{ task }}" {% endblocktrans %}

2
wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved.html
Wyświetl plik

@ -2,6 +2,6 @@
{% load i18n %}
{% block content %}
<p>{% blocktrans with title=page.get_admin_display_title task=task.name %}The page "{{ title }}" has been approved in workflow "{{ workflow }}".{% endblocktrans %}</p>
<p>{% blocktrans with title=page.get_admin_display_title workflow=workflow.name %}The page "{{ title }}" has been approved in workflow "{{ workflow }}".{% endblocktrans %}</p>
<p>{% trans "You can view the page here:" %} <a href="{{ page.full_url }}">{{ page.full_url }}</a></p>
{% endblock %}

4
wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved.txt
Wyświetl plik

@ -1,7 +1,7 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load i18n %}
{% block content %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name %}The page "{{ title }}" has been approved in workflow "{{ workflow }}".{% endblocktrans %}
{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been approved in workflow "{{ workflow }}".{% endblocktrans %}
{% trans "You can view the page here:" %} {{ page.full_url }}
{% endblock %}

2
wagtail/admin/templates/wagtailadmin/notifications/workflow_state_approved_subject.txt
Wyświetl plik

@ -1,3 +1,3 @@
{% load i18n %}
{% blocktrans with title=page.get_admin_display_title|safe task=task.name %}The page "{{ title }}" has been approved in "{{ workflow }}".{% endblocktrans %}
{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been approved in "{{ workflow }}".{% endblocktrans %}

2
wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected.txt
Wyświetl plik

@ -2,7 +2,7 @@
{% load i18n %}
{% block content %}
{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name %}The page "{{ title }}" has been rejected in workflow "{{ workflow }}"".{% endblocktrans %}
{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been rejected in workflow "{{ workflow }}"".{% endblocktrans %}
{% trans "You can edit the page here:"%} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %}
{% endblock %}

2
wagtail/admin/templates/wagtailadmin/notifications/workflow_state_rejected_subject.txt
Wyświetl plik

@ -1,3 +1,3 @@
{% load i18n %}
{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name %}The page "{{ title }}" has been rejected during "{{ workflow }}".{% endblocktrans %}
{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been rejected during "{{ workflow }}".{% endblocktrans %}

4
wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted.txt
Wyświetl plik

@ -1,9 +1,9 @@
{% extends 'wagtailadmin/notifications/base.html' %}
{% extends 'wagtailadmin/notifications/base.txt' %}
{% load i18n %}
{% block content %}
{% blocktrans with workflow=workflow.name title=page.get_admin_display_title|safe %}The page "{{ title }}" has been submitted for moderation to workflow "{{ workflow }}".{% endblocktrans %}
{% blocktrans with workflow=workflow.name|safe title=page.get_admin_display_title|safe %}The page "{{ title }}" has been submitted for moderation to workflow "{{ workflow }}".{% endblocktrans %}
{% trans "You can edit the page here:" %} {{ settings.BASE_URL }}{% url 'wagtailadmin_pages:edit' page.id %}

2
wagtail/admin/templates/wagtailadmin/notifications/workflow_state_submitted_subject.txt
Wyświetl plik

@ -1,3 +1,3 @@
{% load i18n %}
{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name %}The page "{{ title }}" has been submitted to workflow "{{ workflow }}" {% endblocktrans %}
{% blocktrans with title=page.get_admin_display_title|safe workflow=workflow.name|safe %}The page "{{ title }}" has been submitted to workflow "{{ workflow }}" {% endblocktrans %}