Skip to content

Commit

Permalink
changed to user dash
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonLovesDoggo committed Jan 6, 2024
1 parent d69e319 commit 84c4203
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 deletions.
6 changes: 3 additions & 3 deletions dmoj/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ def paged_list_view(view, name):
path('find', user.user_ranking_redirect, name='user_ranking_redirect'),
])),

path('user', user.UserAboutPage.as_view(), name='user_page'),
path('user', user.UserDashboard.as_view(), name='user_dashboard'),
path('edit/profile/', user.edit_profile, name='user_edit_profile'),
path('data/prepare/', user.UserPrepareData.as_view(), name='user_prepare_data'),
path('data/download/', user.UserDownloadData.as_view(), name='user_download_data'),
path('user/<str:user>', include([
path('', user.UserAboutPage.as_view(), name='user_page'),
path('', user.UserDashboard.as_view(), name='user_dashboard'),
path('/solved', include([
path('', user.UserProblemsPage.as_view(), name='user_problems'),
path('/ajax', user.UserPerformancePointsAjax.as_view(), name='user_pp_ajax'),
Expand All @@ -175,7 +175,7 @@ def paged_list_view(view, name):
path('/submissions/', lambda _, user:
HttpResponsePermanentRedirect(reverse('all_user_submissions', args=[user]))),

path('/', lambda _, user: HttpResponsePermanentRedirect(reverse('user_page', args=[user]))),
path('/', lambda _, user: HttpResponsePermanentRedirect(reverse('user_dashboard', args=[user]))),
])),

path('comments/upvote/', comment.upvote_comment, name='comment_upvote'),
Expand Down
4 changes: 3 additions & 1 deletion judge/admin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from django.contrib.flatpages.models import FlatPage

from judge.admin.comments import CommentAdmin
from judge.admin.contest import ContestAdmin, ContestParticipationAdmin, ContestTagAdmin
from judge.admin.contest import ContestAdmin, ContestParticipationAdmin, ContestTagAdmin, ContestRegistrationAdmin
from judge.admin.interface import BlogPostAdmin, FlatPageAdmin, LicenseAdmin, LogEntryAdmin, NavigationBarAdmin
from judge.admin.organization import ClassAdmin, OrganizationAdmin, OrganizationRequestAdmin
from judge.admin.problem import ProblemAdmin, ProblemPointsVoteAdmin
Expand All @@ -16,12 +16,14 @@
from judge.models import BlogPost, Class, Comment, CommentLock, Contest, ContestParticipation, \
ContestTag, Judge, Language, License, MiscConfig, NavigationBar, Organization, \
OrganizationRequest, Problem, ProblemGroup, ProblemPointsVote, ProblemType, Profile, Submission, Ticket
from judge.models.contest import ContestRegistration

admin.site.register(BlogPost, BlogPostAdmin)
admin.site.register(Comment, CommentAdmin)
admin.site.register(CommentLock)
admin.site.register(Contest, ContestAdmin)
admin.site.register(ContestParticipation, ContestParticipationAdmin)
admin.site.register(ContestRegistration, ContestRegistrationAdmin)
admin.site.register(ContestTag, ContestTagAdmin)
admin.site.unregister(FlatPage)
admin.site.register(FlatPage, FlatPageAdmin)
Expand Down
14 changes: 14 additions & 0 deletions judge/admin/contest.py
Original file line number Diff line number Diff line change
Expand Up @@ -367,3 +367,17 @@ def username(self, obj):
@admin.display(description=_('virtual'), ordering='virtual')
def show_virtual(self, obj):
return obj.virtual or '-'


class ContestRegistrationAdmin(admin.ModelAdmin):
fields = ('contest', 'user', 'registration_time', 'data')
list_display = ('contest', 'username', 'registration_time')
search_fields = ('contest__key', 'contest__name', 'user__user__username')
form = ContestParticipationForm
date_hierarchy = 'registration_time'

def username(self, obj):
return obj.user.username

username.short_description = _('username')
username.admin_order_field = 'user__user__username'
2 changes: 1 addition & 1 deletion judge/views/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ def can_prepare_data(self):
@cached_property
def data_cache_key(self):
return 'celery_status_id:user_data_download_%s' % self.request.profile.id

@cached_property
def in_progress_url(self):
status_id = cache.get(self.data_cache_key)
Expand Down

0 comments on commit 84c4203

Please sign in to comment.