From cc8ccc697b7226020d4ef85268c3702f85082d00 Mon Sep 17 00:00:00 2001 From: Obada Haddad Date: Fri, 10 Jan 2025 12:09:59 +0100 Subject: [PATCH 1/2] Added search bar in Django Admin Users and competitions pages as well as some filters --- Dockerfile | 2 +- codalab/apps/authenz/admin.py | 6 +++++- codalab/apps/web/admin.py | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f0a4f1a5..aa0bd527a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM --platform=linux/amd64 python:3.8.3 RUN curl -sL https://deb.nodesource.com/setup_4.x | bash - RUN apt-get update && apt-get install -y npm netcat nodejs python-dev libmemcached-dev -RUN pip install --upgrade pip # make things faster, hopefully +#RUN pip install --upgrade pip # make things faster, hopefully COPY codalab/requirements/requirements.txt requirements.txt RUN pip install -r requirements.txt diff --git a/codalab/apps/authenz/admin.py b/codalab/apps/authenz/admin.py index 07045b1ad..a1c5eb995 100644 --- a/codalab/apps/authenz/admin.py +++ b/codalab/apps/authenz/admin.py @@ -2,5 +2,9 @@ from .models import ClUser +class UserAdmin(admin.ModelAdmin): + search_fields = ['username', 'email'] + list_filter = ['is_staff', 'is_superuser'] + list_display = ['username', 'email', 'is_staff', 'is_superuser'] -admin.site.register(ClUser) +admin.site.register(ClUser, UserAdmin) diff --git a/codalab/apps/web/admin.py b/codalab/apps/web/admin.py index e5bdbc1e5..adb21fa35 100644 --- a/codalab/apps/web/admin.py +++ b/codalab/apps/web/admin.py @@ -18,6 +18,8 @@ class CompetitionAdmin(admin.ModelAdmin): PhaseInlineAdmin, ParticipantInlineAdmin ] + search_fields = ['title', 'creator__username'] + list_display = ['title', 'creator'] admin.site.register(models.Competition, CompetitionAdmin) From 8aaff998be7921e4f764aa256261d040e8809227 Mon Sep 17 00:00:00 2001 From: Obada Haddad Date: Tue, 14 Jan 2025 13:27:18 +0100 Subject: [PATCH 2/2] Removed some inline informations in the Competitions admin page to fix the http 502 error when trying to load big competitions --- codalab/apps/web/admin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/codalab/apps/web/admin.py b/codalab/apps/web/admin.py index adb21fa35..595fee3fa 100644 --- a/codalab/apps/web/admin.py +++ b/codalab/apps/web/admin.py @@ -14,10 +14,10 @@ class ParticipantInlineAdmin(admin.TabularInline): model = models.CompetitionParticipant class CompetitionAdmin(admin.ModelAdmin): - inlines = [ - PhaseInlineAdmin, - ParticipantInlineAdmin - ] + #inlines = [ + #PhaseInlineAdmin, + #ParticipantInlineAdmin + #] search_fields = ['title', 'creator__username'] list_display = ['title', 'creator'] admin.site.register(models.Competition, CompetitionAdmin)