bug fix

neuvue_project/dashboard/views.py

@@ -44,14 +44,15 @@ def _get_status_count(task_df, status):
 class DashboardView(View, LoginRequiredMixin):
     def get(self, request, *args, **kwargs):
         peak_admin = request.user.groups.filter(name=settings.PEAK_ADMIN).exists()
-        if not request.user.is_staff and not peak_admin:
+        if not (request.user.is_staff or peak_admin):
             return redirect(reverse("index"))
 
         Namespaces = apps.get_model("workspace", "Namespace")
         context = {}
         if peak_admin:
+            namespace = Namespaces.objects.filter(namespace=settings.PEAK_NAMESPACE).first().display_name
             context["all_groups"] = [settings.PEAK_COHORT]
-            context["all_namespaces"] = [settings.PEAK_NAMESPACE]
+            context["all_namespaces"] = [namespace]
             context["all_users"] = _get_users_from_group(settings.PEAK_COHORT)
         else:
             context["all_groups"] = sorted([x.name for x in Group.objects.all()])
@@ -84,10 +85,10 @@ def post(self, request, *args, **kwargs):
 class DashboardNamespaceView(View, LoginRequiredMixin):
     def get(self, request, group=None, namespace=None, *args, **kwargs):
         peak_admin = request.user.groups.filter(name=settings.PEAK_ADMIN).exists()
-        if not request.user.is_staff and not peak_admin:
+        if not (request.user.is_staff or peak_admin):
             return redirect(reverse("index"))
-
-        if namespace != settings.PEAK_NAMESPACE:
+        
+        if peak_admin and namespace != settings.PEAK_NAMESPACE:
             return redirect(reverse("index"))
 
         Namespaces = apps.get_model("workspace", "Namespace")
@@ -183,16 +184,17 @@ def _generate_table_and_counts(self, namespace: str, users: List):
 class DashboardUserView(View, LoginRequiredMixin):
     def get(self, request, username=None, filter=None, *args, **kwargs):
         peak_admin = request.user.groups.filter(name=settings.PEAK_ADMIN).exists()
-        if not request.user.is_staff and not peak_admin:
+        if not (request.user.is_staff or peak_admin):
             return redirect(reverse("index"))
 
-        if username not in _get_users_from_group(settings.PEAK_COHORT):
+        if peak_admin and username not in _get_users_from_group(settings.PEAK_COHORT):
             return redirect(reverse("index"))
+
         context = {}
         if peak_admin:
             table, counts = self._generate_table_and_counts(username, settings.PEAK_NAMESPACE)
         else:
-            table, counts = self._generate_table_and_counts(username, settings.PEAK_NAMESPACE)
+            table, counts = self._generate_table_and_counts(username)
 
         context["username"] = username
         context["table"] = table

neuvue_project/neuvue/settings.py

@@ -22,7 +22,7 @@
 SECRET_KEY = os.environ["DJANGO_SECRET_KEY"]
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 
 ALLOWED_HOSTS = [
     "app.neuvue.io",
@@ -240,6 +240,6 @@
 STATIC_NG_FILES = os.listdir(os.path.join(BASE_DIR, "workspace", "static", "workspace"))
 
 # PEAK EXPERIMENT
-PEAK_ADMIN = "AGTExpAdmins"
-PEAK_COHORT = "PeakCohort"
+PEAK_ADMIN = "PeakAdmins"
+PEAK_COHORT = "PeakParticipants"
 PEAK_NAMESPACE = "peakExtension"

neuvue_project/workspace/views/tools.py

@@ -43,7 +43,7 @@ def get(self, request, task_id=None, *args, **kwargs):
             logging.warning(f"Unauthorized requests from {request.user}.")
             return redirect(reverse("index"))
 
-        if request.user.username in _get_users_from_group(settings.PEAK_NAMESPACE):
+        if request.user.username in _get_users_from_group(settings.PEAK_COHORT):
             return redirect(reverse("index"))
 
         if task_id is None: