Skip to content
Snippets Groups Projects
Commit e426c1ce authored by Martin Mareš's avatar Martin Mareš
Browse files

Práva: Job na upload feedbacku

parent 833646bb
No related branches found
No related tags found
1 merge request!17Výsledkovka pomocí mo.web.table
This commit is part of merge request !17. Comments created here will be created in the context of that merge request.
...@@ -13,7 +13,7 @@ import zipfile ...@@ -13,7 +13,7 @@ import zipfile
import mo.db as db import mo.db as db
from mo.jobs import TheJob, job_handler, job_file_path from mo.jobs import TheJob, job_handler, job_file_path
import mo.rights from mo.rights import Right
from mo.submit import Submitter, SubmitException from mo.submit import Submitter, SubmitException
from mo.util import logger, data_dir from mo.util import logger, data_dir
from mo.util_format import inflect_number, inflect_by_number from mo.util_format import inflect_number, inflect_by_number
...@@ -169,17 +169,13 @@ def handle_upload_feedback(the_job: TheJob): ...@@ -169,17 +169,13 @@ def handle_upload_feedback(the_job: TheJob):
.filter(db.Participation.user_id.in_(user_dict.keys())) .filter(db.Participation.user_id.in_(user_dict.keys()))
.all()) .all())
rr = mo.rights.Rights(job.user)
rights_cache = {}
user_rights = {} user_rights = {}
for user, pion, contest in rows: for user, pion, contest in rows:
user_dict[user.user_id] = user user_dict[user.user_id] = user
if contest.contest_id not in rights_cache: rr = the_job.gatekeeper.rights_for_contest(contest)
rr.get_for_contest(contest) user_rights[user.user_id] = (
rights_cache[contest.contest_id] = ( rr.have_right(Right.upload_submits)
rr.have_right(mo.rights.Right.upload_submits) or (rr.have_right(Right.upload_feedback) and round.state == db.RoundState.grading))
or (rr.have_right(mo.rights.Right.upload_feedback) and round.state == db.RoundState.grading))
user_rights[user.user_id] = rights_cache[contest.contest_id]
for f in files: for f in files:
f.user = user_dict[f.user_id] f.user = user_dict[f.user_id]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment