diff options
| author | Andrea Lepori <alepori@student.ethz.ch> | 2022-03-23 19:24:09 +0100 |
|---|---|---|
| committer | Andrea Lepori <alepori@student.ethz.ch> | 2022-03-23 19:24:21 +0100 |
| commit | 7dfc0383561cb9f13282e7779b919f5b17859f86 (patch) | |
| tree | d2f3ed554dfd259025845c7f93e02254e1a8beb3 /server | |
| parent | initial support of user switcher (diff) | |
| parent | in case of error redirect to home page (diff) | |
| download | scout-subs-7dfc0383561cb9f13282e7779b919f5b17859f86.tar.gz scout-subs-7dfc0383561cb9f13282e7779b919f5b17859f86.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'server')
| -rw-r--r-- | server/templates/server/doc_list.html | 2 | ||||
| -rw-r--r-- | server/templates/server/doc_type.html | 2 | ||||
| -rw-r--r-- | server/views.py | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/server/templates/server/doc_list.html b/server/templates/server/doc_list.html index 736fdd4..5b898ec 100644 --- a/server/templates/server/doc_list.html +++ b/server/templates/server/doc_list.html @@ -508,7 +508,7 @@ $('#chips_owner').chips({ autocompleteOptions: { data: { {% for user in users %} - '{{user.username}} ({{user.first_name}} {{user.last_name}})': null, + '{{user.user__username}} ({{user.user__first_name}} {{user.user__last_name}})': null, {% endfor %} }, limit: Infinity, diff --git a/server/templates/server/doc_type.html b/server/templates/server/doc_type.html index 8b2131d..4f8fe6f 100644 --- a/server/templates/server/doc_type.html +++ b/server/templates/server/doc_type.html @@ -213,7 +213,7 @@ <i class="material-icons">message</i>Messaggio aggiuntivo </div> <div class="collapsible-body"><span> - {{doctype.custom_message_text}} + {{doctype.custom_message_text | linebreaksbr}} </span></div> </li> {% endif %} 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":
|