moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

workshop fixing incorrect use of logical operators

Browse source
This commit is contained in:
David Mudrak 2010-01-04 18:28:56 +00:00
parent a0aa8b2c01
commit 090a7907da
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/workshop/assessment.php
View file

@ -58,7 +58,7 @@ $currenttab = 'assessment';
$canviewallassessments = has_capability('mod/workshop:viewallassessments', $workshop->context); $canviewallassessments = has_capability('mod/workshop:viewallassessments', $workshop->context);
$canviewallsubmissions = has_capability('mod/workshop:viewallsubmissions', $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); $isreviewer = ($USER->id == $assessment->reviewerid);
$isauthor = ($USER->id == $submission->authorid); $isauthor = ($USER->id == $submission->authorid);

4
mod/workshop/submission.php
View file

@ -56,10 +56,10 @@ if ($id) { // submission is specified
$ownsubmission = $submission->authorid == $USER->id; $ownsubmission = $submission->authorid == $USER->id;
$canviewall = has_capability('mod/workshop:viewallsubmissions', $workshop->context); $canviewall = has_capability('mod/workshop:viewallsubmissions', $workshop->context);
$cansubmit = has_capability('mod/workshop:submit', $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)); $isreviewer = $DB->record_exists('workshop_assessments', array('submissionid' => $submission->id, 'reviewerid' => $USER->id));
$editable = $workshop->submitting_allowed(); $editable = $workshop->submitting_allowed();
$edit = $editable and $edit; $edit = ($editable and $edit);
if ($submission->id and ($ownsubmission or $canviewall or $isreviewer)) { if ($submission->id and ($ownsubmission or $canviewall or $isreviewer)) {
// ok you can go // ok you can go