Commit c32ba4e2 authored by Marina Glancy's avatar Marina Glancy
Browse files

Merge branch '42690-26' of git://github.com/samhemelryk/moodle

parents ee8e077a 19195b60
......@@ -2762,21 +2762,6 @@ class assign {
$extensionduedate = $flags->extensionduedate;
}
$showedit = $this->submissions_open($userid) && ($this->is_any_submission_plugin_enabled());
if ($teamsubmission) {
$showsubmit = $showedit &&
$teamsubmission &&
($teamsubmission->status != ASSIGN_SUBMISSION_STATUS_SUBMITTED) &&
!$this->submission_empty($teamsubmission);
} else {
$showsubmit = $showedit &&
$submission &&
($submission->status != ASSIGN_SUBMISSION_STATUS_SUBMITTED) &&
!$this->submission_empty($submission);
}
if (!$this->get_instance()->submissiondrafts) {
$showsubmit = false;
}
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_course_context());
$submissionstatus = new assign_submission_status($instance->allowsubmissionsfromdate,
......@@ -2798,7 +2783,7 @@ class assign {
$this->get_course()->id,
assign_submission_status::GRADER_VIEW,
$showedit,
$showsubmit,
false,
$viewfullnames,
$extensionduedate,
$this->get_context(),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment