From 68aa22e01ae80b3bcdc31ee8121ed737714b291d Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 14 Dec 2021 19:35:22 +0000 Subject: [PATCH] . --- generic/templates/generic/group_view copy.html | 9 +++++++++ .../{author_list.html => group_view.html} | 0 generic/urls.py | 1 + generic/views.py | 16 ++++++++++++++++ 4 files changed, 26 insertions(+) create mode 100755 generic/templates/generic/group_view copy.html rename generic/templates/generic/{author_list.html => group_view.html} (100%) diff --git a/generic/templates/generic/group_view copy.html b/generic/templates/generic/group_view copy.html new file mode 100755 index 00000000..37df6a09 --- /dev/null +++ b/generic/templates/generic/group_view copy.html @@ -0,0 +1,9 @@ +{% extends 'generic/base.html' %} + +{% block content %} + +The following users have been emailed: +{% for u in users %} +

{{u.cid}}: {{u.email}}

+{% endfor %} +{% endblock %} \ No newline at end of file diff --git a/generic/templates/generic/author_list.html b/generic/templates/generic/group_view.html similarity index 100% rename from generic/templates/generic/author_list.html rename to generic/templates/generic/group_view.html diff --git a/generic/urls.py b/generic/urls.py index 131a5769..769419c4 100755 --- a/generic/urls.py +++ b/generic/urls.py @@ -28,5 +28,6 @@ urlpatterns = [ ), path("cids/manage/", views.CidUserView.as_view(), name="manage_cids"), path("cids/group/", views.group_view, name="group_view"), + path("cids/group//email", views.group_email, name="group_email"), path("cids/create", views.manage_cid_users, name="manage_cid_users"), ] diff --git a/generic/views.py b/generic/views.py index f9b72e52..b84bb865 100644 --- a/generic/views.py +++ b/generic/views.py @@ -999,6 +999,22 @@ def group_view(request): {"groups": groups}, ) +@login_required +@user_is_cid_user_manager +def group_email(request, pk): + group = get_object_or_404(CidUserGroup, pk=pk) + + users = group.ciduser_set.all() + + for u in users: + u.email_details() + + return render( + request, + "generic/group_emailed.html", + {"users": users}, + ) + @login_required @user_is_cid_user_manager def manage_cid_users(request):