mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
workshop fixing incorrect use of logical operators
This commit is contained in:
parent
a0aa8b2c01
commit
090a7907da
@ -58,7 +58,7 @@ $currenttab = 'assessment';
|
||||
|
||||
$canviewallassessments = has_capability('mod/workshop:viewallassessments', $workshop->context);
|
||||
$canviewallsubmissions = has_capability('mod/workshop:viewallsubmissions', $workshop->context);
|
||||
$canoverridegrades = ($workshop->phase == workshop::PHASE_EVALUATION) and has_capability('mod/workshop:overridegrades', $workshop->context);
|
||||
$canoverridegrades = (($workshop->phase == workshop::PHASE_EVALUATION) and has_capability('mod/workshop:overridegrades', $workshop->context));
|
||||
$isreviewer = ($USER->id == $assessment->reviewerid);
|
||||
$isauthor = ($USER->id == $submission->authorid);
|
||||
|
||||
|
@ -56,10 +56,10 @@ if ($id) { // submission is specified
|
||||
$ownsubmission = $submission->authorid == $USER->id;
|
||||
$canviewall = has_capability('mod/workshop:viewallsubmissions', $workshop->context);
|
||||
$cansubmit = has_capability('mod/workshop:submit', $workshop->context);
|
||||
$canoverride = ($workshop->phase == workshop::PHASE_EVALUATION) and has_capability('mod/workshop:overridegrades', $workshop->context);
|
||||
$canoverride = (($workshop->phase == workshop::PHASE_EVALUATION) and has_capability('mod/workshop:overridegrades', $workshop->context));
|
||||
$isreviewer = $DB->record_exists('workshop_assessments', array('submissionid' => $submission->id, 'reviewerid' => $USER->id));
|
||||
$editable = $workshop->submitting_allowed();
|
||||
$edit = $editable and $edit;
|
||||
$edit = ($editable and $edit);
|
||||
|
||||
if ($submission->id and ($ownsubmission or $canviewall or $isreviewer)) {
|
||||
// ok you can go
|
||||
|
Loading…
x
Reference in New Issue
Block a user