.
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
{% extends 'base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block title %}
|
{% block title %}
|
||||||
Candidates
|
Candidates
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block css %}
|
{% block css %}
|
||||||
@@ -15,9 +15,11 @@ Candidates
|
|||||||
{% block content %}
|
{% block content %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block navigation %}
|
{% block navigation %}
|
||||||
Candidates:
|
Candidates:
|
||||||
{% if request.user.is_authenticated %}
|
{% if request.user.is_authenticated %}
|
||||||
<a href="{% url 'generic:manage_cids' %}">Cids</a> /
|
<a href="{% url 'generic:manage_cids' %}">Cids</a> /
|
||||||
<a href="{% url 'generic:group_view' %}">Groups</a> /
|
<a href="{% url 'generic:manage_cid_exams' %}">Cids (exams)</a> /
|
||||||
{% endif %}
|
<a href="{% url 'generic:group_view' %}">Groups</a> /
|
||||||
|
|
||||||
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@@ -28,6 +28,7 @@ urlpatterns = [
|
|||||||
),
|
),
|
||||||
path("cids/manage/<int:pk>/update", views.CidUserUpdate.as_view(), name="update_cid"),
|
path("cids/manage/<int:pk>/update", views.CidUserUpdate.as_view(), name="update_cid"),
|
||||||
path("cids/manage/", views.CidUserView.as_view(), name="manage_cids"),
|
path("cids/manage/", views.CidUserView.as_view(), name="manage_cids"),
|
||||||
|
path("cids/manage/exams", views.CidUserExamView.as_view(), name="manage_cid_exams"),
|
||||||
path("cids/group/", views.group_view, name="group_view"),
|
path("cids/group/", views.group_view, name="group_view"),
|
||||||
path("cids/group/<int:pk>/email", views.group_email, name="group_email"),
|
path("cids/group/<int:pk>/email", views.group_email, name="group_email"),
|
||||||
path("cids/group/<int:pk>/email_results", views.group_email_results, name="group_email_results"),
|
path("cids/group/<int:pk>/email_results", views.group_email_results, name="group_email_results"),
|
||||||
|
|||||||
+19
-2
@@ -1297,8 +1297,7 @@ class ExaminationAutocomplete(autocomplete.Select2QuerySetView):
|
|||||||
|
|
||||||
return qs
|
return qs
|
||||||
|
|
||||||
|
class CidUserExamView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
|
||||||
class CidUserView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
|
|
||||||
model = CidUser
|
model = CidUser
|
||||||
table_class = CidUserTable
|
table_class = CidUserTable
|
||||||
template_name = "generic/cid_view.html"
|
template_name = "generic/cid_view.html"
|
||||||
@@ -1329,6 +1328,24 @@ class CidUserView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
|
|||||||
context["cid_user_groups"] = cid_user_groups
|
context["cid_user_groups"] = cid_user_groups
|
||||||
return context
|
return context
|
||||||
|
|
||||||
|
class CidUserView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
|
||||||
|
model = CidUser
|
||||||
|
table_class = CidUserTable
|
||||||
|
template_name = "generic/cid_view.html"
|
||||||
|
|
||||||
|
filterset_class = CidUserFilter
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
# user = self.request.user
|
||||||
|
|
||||||
|
cid_user_groups = [
|
||||||
|
(i.name, i.pk) for i in CidUserGroup.objects.filter(archive=False)
|
||||||
|
]
|
||||||
|
|
||||||
|
context["cid_user_groups"] = cid_user_groups
|
||||||
|
return context
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@user_is_cid_user_manager
|
@user_is_cid_user_manager
|
||||||
|
|||||||
Reference in New Issue
Block a user