ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add `user__sso_id` field to CourseSessionUserAdmin

This commit is contained in:
Daniel Egger 2024-08-28 22:07:55 +02:00
parent 1cc1f8c51d
commit c34a42fba1
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/vbv_lernwelt/course/admin.py
View File

@ -65,6 +65,7 @@ class CourseSessionUserAdmin(admin.ModelAdmin):
"role", "role",
"circles", "circles",
"optional_attendance", "optional_attendance",
"user_sso_id",
# "created_at", # "created_at",
# "updated_at", # "updated_at",
] ]
@ -95,6 +96,12 @@ class CourseSessionUserAdmin(admin.ModelAdmin):
user_last_name.short_description = "Last Name" user_last_name.short_description = "Last Name"
user_last_name.admin_order_field = "user__last_name" user_last_name.admin_order_field = "user__last_name"
def user_sso_id(self, obj):
return obj.user.sso_id
user_sso_id.short_description = "SSO ID"
user_sso_id.admin_order_field = "user__sso_id"
def circles(self, obj): def circles(self, obj):
return ", ".join([c.title for c in obj.expert.all()]) return ", ".join([c.title for c in obj.expert.all()])

8
server/vbv_lernwelt/course/middleware.py
View File

@ -177,9 +177,9 @@ class GraphQLQueryFilterMiddleware:
request._body = json.dumps(body).encode("utf-8") request._body = json.dumps(body).encode("utf-8")
response = self.get_response(request) response = self.get_response(request)
content = json.loads(response.content) content = json.loads(response.content)
cache_data["data"]["course"][ cache_data["data"]["course"]["course_session_users"] = (
"course_session_users" content["data"]["course"]["course_session_users"]
] = content["data"]["course"]["course_session_users"] )
response.content = json.dumps(cache_data) response.content = json.dumps(cache_data)
return response return response
@ -194,7 +194,7 @@ class GraphQLQueryFilterMiddleware:
return response return response
except Exception as e: except Exception as e:
# Handle any exceptions in parsing or filtering # Handle any exceptions in parsing or filtering
logger.error(f"Error in GraphQLQueryFilterMiddleware", exc_info=e) logger.error("Error in GraphQLQueryFilterMiddleware", exc_info=e)
# Continue processing the request if not blocked # Continue processing the request if not blocked
response = self.get_response(request) response = self.get_response(request)

4
server/vbv_lernwelt/debugtools/decorators.py
View File

@ -25,7 +25,9 @@ def count_queries(func):
# Calculate the execution time # Calculate the execution time
execution_time = end_time - start_time execution_time = end_time - start_time
print(f"{func.__name__} executed {query_count} queries in {execution_time:.4f} seconds.") print(
f"{func.__name__} executed {query_count} queries in {execution_time:.4f} seconds."
)
return result return result