assignment MDL-24373 removed file count check to display button to manage assignment files submitted. file limits are managed entirely via the file manager ui.

This commit is contained in:
Aparup Banerjee
2010-09-24 07:09:42 +00:00
parent a089b8d131
commit 694b7aef38
@@ -88,6 +88,9 @@ class assignment_upload extends assignment_base {
if (has_capability('mod/assignment:submit', $this->context)) {
$this->view_upload_form();
debugging('yes mod/assignment:submit');
} else {
debugging('no mod/assignment:submit');
}
if ($this->notes_allowed()) {
@@ -187,10 +190,12 @@ class assignment_upload extends assignment_base {
if ($this->is_finalized($submission)) {
// no uploading
debugging('finalized');
return;
}
if ($this->can_upload_file($submission)) {
debugging('can upload');
$fs = get_file_storage();
// edit files in another page
if ($submission) {
@@ -203,8 +208,9 @@ class assignment_upload extends assignment_base {
$str = get_string('uploadfiles', 'assignment');
}
echo $OUTPUT->single_button(new moodle_url('/mod/assignment/type/upload/upload.php', array('contextid'=>$this->context->id, 'userid'=>$USER->id)), $str, 'get');
} else {
debugging('cant upload');
}
}
function view_notes() {
@@ -861,8 +867,7 @@ class assignment_upload extends assignment_base {
if (is_enrolled($this->context, $USER, 'mod/assignment:submit')
and $this->isopen() // assignment not closed yet
and (empty($submission) or ($submission->userid == $USER->id // his/her own submission
and $this->count_user_files($submission->id) <= $this->assignment->var1)) // file limit not exceeded
and (empty($submission) or ($submission->userid == $USER->id)) // his/her own submission
and !$this->is_finalized($submission)) { // no uploading after final submission
return true;
} else {