From 6618ff25fb57267548c256782fdd4df327133ee7 Mon Sep 17 00:00:00 2001 From: test test Date: Thu, 27 May 2021 11:53:41 +0200 Subject: [PATCH] Postman migration WIP --- app/settings.py | 1 + app/urls.py | 1 + teleforma/templates/postman/base.html | 10 +++++----- teleforma/templates/postman/base_folder.html | 12 ++++++------ teleforma/templates/postman/view.html | 6 +++--- teleforma/templates/teleforma/base.html | 5 ++--- teleforma/templates/teleforma/inc/user_list.html | 2 +- teleforma/templates/teleforma/profile_detail.html | 2 +- teleforma/templates/teleforma/users.html | 2 +- teleforma/templates/telemeta/base.html | 2 +- 10 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app/settings.py b/app/settings.py index b0abcfc4..8441798d 100644 --- a/app/settings.py +++ b/app/settings.py @@ -219,6 +219,7 @@ SERVER_EMAIL = 'crfpa@pre-barreau.com' EMAIL_SUBJECT_PREFIX = '[' + TELEMETA_ORGANIZATION + '] ' POSTMAN_AUTO_MODERATE_AS = True +POSTMAN_DISALLOW_ANONYMOUS = True #FILE_PROTECTION_METHOD = 'xsendfile' diff --git a/app/urls.py b/app/urls.py index 132935a2..2fc2ff89 100644 --- a/app/urls.py +++ b/app/urls.py @@ -29,4 +29,5 @@ urlpatterns = [ #url(r'^pdfviewer/', include('webviewer.urls')), url(r'^pdfannotator/', include('pdfannotator.urls')), url(r'^captcha/', include('captcha.urls')), + url(r'^messages/', include('postman.urls', namespace='postman')), ] diff --git a/teleforma/templates/postman/base.html b/teleforma/templates/postman/base.html index d172ced3..1ba9388f 100644 --- a/teleforma/templates/postman/base.html +++ b/teleforma/templates/postman/base.html @@ -12,15 +12,15 @@
{% postman_unread as unread_count %}
-{% trans "New message" %} +{% trans "New message" %}
diff --git a/teleforma/templates/postman/base_folder.html b/teleforma/templates/postman/base_folder.html index 1de6da47..376cc003 100644 --- a/teleforma/templates/postman/base_folder.html +++ b/teleforma/templates/postman/base_folder.html @@ -47,13 +47,13 @@ - {% block pm_sender_cell %}{% if message.is_new %}{% endif %}{{ message.obfuscated_sender|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{% if message.is_new %}{% endif %}{% endblock %} + {% block pm_sender_cell %}{% if message.is_new %}{% endif %}{{ message.obfuscated_sender|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{% if message.is_new %}{% endif %}{% endblock %} - {% block pm_recipient_cell %}{{ message.obfuscated_recipient|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{% endblock %} + {% block pm_recipient_cell %}{{ message.obfuscated_recipient|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{% endblock %} {% if message.is_new %}{% endif %}{% if message.is_replied %}{% endif %} {% block pm_subject %} - + {% include "postman/inc_subject_ex.html" %} {% endblock %} {% if message.is_replied %}{% endif %}{% if message.is_new %}{% endif %} @@ -66,13 +66,13 @@
{% block pm_form_buttons %} {% block pm_delete_button %} -{% trans "Delete" %} +{% trans "Delete" %} {% endblock %} {% block pm_archive_button %} -{% trans "Archive" %} +{% trans "Archive" %} {% endblock %} {% block pm_undelete_button %} -{% trans "Undelete" %} +{% trans "Undelete" %} {% endblock %} {% endblock %} diff --git a/teleforma/templates/postman/view.html b/teleforma/templates/postman/view.html index ce988abb..5f8cc0fa 100644 --- a/teleforma/templates/postman/view.html +++ b/teleforma/templates/postman/view.html @@ -44,17 +44,17 @@ {% trans "Back" %} {% block pm_delete_button %} -{% trans "Delete" %} +{% trans "Delete" %} {% endblock %} {% block pm_archive_button %} {% if not archived %} -{% trans "Archive" %} +{% trans "Archive" %} {% endif %} {% endblock %} {% if reply_to_pk %}

{% trans 'Reply' %}

-
{% csrf_token %} +{% csrf_token %}
{{ form.body }}

{% trans "Reply" %} diff --git a/teleforma/templates/teleforma/base.html b/teleforma/templates/teleforma/base.html index a9b83ee1..17501b46 100644 --- a/teleforma/templates/teleforma/base.html +++ b/teleforma/templates/teleforma/base.html @@ -76,7 +76,6 @@