FIX recent ides on admin/user page

AnubisLMS · Sep 12, 2022 · 33101ca · 33101ca
1 parent 8df8112
commit 33101ca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/api/anubis/ide/get.py b/api/anubis/ide/get.py
@@ -4,8 +4,8 @@
 from anubis.utils.data import is_debug
 
 
-@cache.memoize(timeout=5, source_check=True)
-def get_recent_sessions(user_id: str, limit: int = 10, offset: int = 10) -> list[dict]:
+@cache.memoize(timeout=5, source_check=True, unless=is_debug)
+def get_recent_sessions(user_id: str, limit: int = 10, offset: int = 0) -> list[dict]:
     student = User.query.filter(
         User.id == user_id,
     ).first()

diff --git a/api/anubis/models/__init__.py b/api/anubis/models/__init__.py
@@ -747,7 +747,7 @@ def data(self):
             "last_updated":       str(self.last_updated),
             "autosave":           self.autosave,
             "persistent_storage": self.persistent_storage,
-            "image":              self.image.data,
+            "image":              self.image.data if self.image_id else None,
             "image_tag":          self.image_tag.data if self.image_tag_id else None,
         }
 

diff --git a/web/src/pages/core/admin/User.jsx b/web/src/pages/core/admin/User.jsx
@@ -132,11 +132,11 @@ export default function User() {
                     ),
                   },
                   {
-                    field: 'image', headerName: 'Image', width: 100, renderCell: (params) => (params.value.title),
+                    field: 'image', headerName: 'Image', width: 100, renderCell: (params) => (params.value?.title ?? ''),
                   },
                   {
                     field: 'image_tag', headerName: 'Image Tag', width: 120, renderCell: (params) => (
-                      params.value || params.row.image.default_tag || 'latest'
+                      params.value || params.row.image?.default_tag || 'latest'
                     ),
                   },
                   {field: 'created', headerName: 'Start Time', width: 170},