From 8dd3669af42d929010234ddcbc6ff6f9e209587a Mon Sep 17 00:00:00 2001
From: Inga Kirschnick <inga.kirschnick@uni-bielefeld.de>
Date: Mon, 17 Apr 2023 09:43:12 +0200
Subject: [PATCH] checking terms of use confirmation update
---
app/static/js/Requests/users/settings.js | 7 -------
app/static/js/Requests/users/users.js | 10 ++++++++++
app/templates/_scripts.html.j2 | 6 ++----
app/templates/base.html.j2 | 4 +++-
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/app/static/js/Requests/users/settings.js b/app/static/js/Requests/users/settings.js
index 7584e9bb..609ecb35 100644
--- a/app/static/js/Requests/users/settings.js
+++ b/app/static/js/Requests/users/settings.js
@@ -15,10 +15,3 @@ Requests.users.entity.settings.profilePrivacy.update = (userId, profilePrivacySe
return Requests.JSONfetch(input, init);
};
-Requests.users.entity.settings.acceptTermsOfUse = () => {
- let input = `/users/accept-terms-of-use`;
- let init = {
- method: 'POST'
- };
- return Requests.JSONfetch(input, init);
-};
diff --git a/app/static/js/Requests/users/users.js b/app/static/js/Requests/users/users.js
index 053fd687..4baf4717 100644
--- a/app/static/js/Requests/users/users.js
+++ b/app/static/js/Requests/users/users.js
@@ -14,6 +14,15 @@ Requests.users.entity.delete = (userId) => {
return Requests.JSONfetch(input, init);
};
+Requests.users.entity.acceptTermsOfUse = () => {
+ let input = `/users/accept-terms-of-use`;
+ let init = {
+ method: 'POST'
+ };
+ return Requests.JSONfetch(input, init);
+};
+
+
Requests.users.entity.avatar = {};
Requests.users.entity.avatar.delete = (userId) => {
@@ -23,3 +32,4 @@ Requests.users.entity.avatar.delete = (userId) => {
};
return Requests.JSONfetch(input, init);
}
+
diff --git a/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2
index 5749d86b..b63c8c39 100644
--- a/app/templates/_scripts.html.j2
+++ b/app/templates/_scripts.html.j2
@@ -115,14 +115,12 @@
{
dismissible: false,
onCloseEnd: () => {
- Requests.users.entity.settings.acceptTermsOfUse();
+ Requests.users.entity.acceptTermsOfUse();
}
}
);
- {% if current_user.is_authenticated %}
- {% if not current_user.terms_of_use_accepted %}
+ {% if current_user.is_authenticated and not current_user.terms_of_use_accepted %}
termsOfUseModal.M_Modal.open();
- {% endif %}
{% endif %}
</script>
diff --git a/app/templates/base.html.j2 b/app/templates/base.html.j2
index 22ba16e1..9dd20f08 100644
--- a/app/templates/base.html.j2
+++ b/app/templates/base.html.j2
@@ -38,7 +38,9 @@
{# {% if current_user.is_authenticated %}
{% include "_roadmap.html.j2" %}
{% endif %} #}
- {% include "_terms_of_use_modal.html.j2" %}
+ {% if current_user.is_authenticated and not current_user.terms_of_use_accepted %}
+ {% include "_terms_of_use_modal.html.j2" %}
+ {% endif %}
{% endblock modals %}
</div>
{% endblock main %}
--
GitLab