aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Lepori <alepori@student.ethz.ch>2022-01-11 16:01:54 +0100
committerAndrea Lepori <alepori@student.ethz.ch>2022-01-11 16:02:07 +0100
commit9f1ae7f9b3fab995748ead2549b77d4d0605521f (patch)
tree76560e7f7526f678a7b33b4f458313f60fb9faab
parentfix user filter not displaing properly (diff)
downloadscout-subs-9f1ae7f9b3fab995748ead2549b77d4d0605521f.tar.gz
scout-subs-9f1ae7f9b3fab995748ead2549b77d4d0605521f.zip
hide user from data request if not approved
-rw-r--r--server/views.py6
-rw-r--r--version.txt2
2 files changed, 5 insertions, 3 deletions
diff --git a/server/views.py b/server/views.py
index 0e032f0..c91db1e 100644
--- a/server/views.py
+++ b/server/views.py
@@ -1472,11 +1472,13 @@ def data_request(request):
if "request" not in request.POST.keys():
context["error"] = "Selezionare una richesta"
elif request.POST["request"] == "email_all":
- users_email = User.objects.filter(groups__name=parent_group).values_list("email", flat=True)
+ perm = Permission.objects.get(codename="approved")
+ users_email = User.objects.filter(groups__name=parent_group, user_permissions=perm).values_list("email", flat=True)
data = ", ".join(users_email)
context["data"] = data
elif request.POST["request"] == "email_non_staff":
- users_email = User.objects.filter(groups__name=parent_group).exclude(groups__name="capi").values_list("email", flat=True)
+ perm = Permission.objects.get(codename="approved")
+ users_email = User.objects.filter(groups__name=parent_group, user_permission=perm).exclude(groups__name="capi").values_list("email", flat=True)
data = ", ".join(users_email)
context["data"] = data
elif request.POST["request"] == "data_user":
diff --git a/version.txt b/version.txt
index b58ad09..38b0958 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,2 @@
version=0.4
-rev=28
+rev=29