lkva/NDOJ
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Redesign org list

Browse source
This commit is contained in:
cuom1999 2022-06-18 14:32:37 +07:00
parent cd5672abf0
commit 289e9ab7db
5 changed files with 238 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

11
judge/views/organization.py
View file

@ -238,9 +238,16 @@ class OrganizationList(TitleMixin, ListView, OrganizationBase):
def get_context_data(self, **kwargs):
context = super(OrganizationList, self).get_context_data(**kwargs)
context["my_organizations"] = []
context["page_type"] = "organizations"
if self.request.profile:
context["my_organizations"] = self.request.profile.organizations.all()
context["my_organizations"] = context["organizations"].filter(
id__in=self.request.profile.organizations.values("id")
)
other_organizations = context["organizations"].exclude(
id__in=context["my_organizations"]
)
context["open_organizations"] = other_organizations.filter(is_open=True)
context["private_organizations"] = other_organizations.filter(is_open=False)
return context

4
judge/views/submission.py
View file

@ -88,7 +88,9 @@ class SubmissionDetailBase(LoginRequiredMixin, TitleMixin, SubmissionMixin, Deta
problem = submission.problem
if self.request.user.has_perm("judge.view_all_submission"):
return submission
if problem.is_public and self.request.user.has_perm("judge.view_public_submission"):
if problem.is_public and self.request.user.has_perm(
"judge.view_public_submission"
):
return submission
if submission.user_id == profile.id:
return submission