From 2984f27249ed11af51b6d2f8b07c2432de6852d4 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 5 Dec 2022 09:27:15 +0000
Subject: [PATCH] .

---
 generic/models.py | 2 +-
 generic/tables.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generic/models.py b/generic/models.py
index 1dd88985..d120e40b 100644
--- a/generic/models.py
+++ b/generic/models.py
@@ -469,7 +469,7 @@ class CidUser(models.Model):
                 exams = exam_rel.filter(exam_mode=True, archive=False).order_by("name")
                 available_exams.append((n, exams))
 
-        return dict(available_exams)
+        return available_exams
 
     def generate_exam_report(self):
         exam_list = self.get_cid_exams()
diff --git a/generic/tables.py b/generic/tables.py
index 3e300ca0..92e6eb4e 100644
--- a/generic/tables.py
+++ b/generic/tables.py
@@ -135,7 +135,7 @@ class UserUserTable(tables.Table):
     )
 
     supervisor = tables.Column(
-        linkify={"viewname": "generic:supervisor_detail", "args":[A("userprofile.supervisor.pk")]}, orderable=True, verbose_name="Supervisor", accessor=A("userprofile.supervisor")
+        linkify={"viewname": "generic:supervisor_detail", "args":[A("userprofile__supervisor__pk")]}, orderable=True, verbose_name="Supervisor", accessor=A("userprofile__supervisor")
     )
 
     selection = tables.CheckBoxColumn(accessor="pk", orderable=False)
@@ -152,12 +152,12 @@ class UserUserTable(tables.Table):
         fields = (
             # "cid",
             #"userprofile",
-            "userprofile.grade",
+            "userprofile__grade",
             #"user_groups",
             #"userprofile.supervisor",
             # "email",
         )
-        sequence = ("user", "userprofile.grade", "supervisor", "user_groups", "edit")
+        sequence = ("user", "userprofile__grade", "supervisor", "user_groups", "edit")
 
     def __init__(self, data=None, *args, **kwargs):
         super().__init__(