Permalink
Browse files

Merge branch 'm20_MDL-28559' of git://github.com/danmarsden/moodle in…

…to MOODLE_20_STABLE
  • Loading branch information...
2 parents e1fe0c5 + 5c5dbec commit f672031f54179d10ab20c35a1969df7a83c939c5 Sam Hemelryk committed Oct 31, 2011
Showing with 21 additions and 21 deletions.
  1. +21 −21 mod/assignment/type/upload/assignment.class.php
@@ -44,6 +44,7 @@ function view() {
global $USER, $OUTPUT;
require_capability('mod/assignment:view', $this->context);
+ $cansubmit = has_capability('mod/assignment:submit', $this->context);
add_to_log($this->course->id, 'assignment', 'view', "view.php?id={$this->cm->id}", $this->assignment->id, $this->cm->id);
@@ -67,35 +68,34 @@ function view() {
} else {
$filecount = 0;
}
+ if ($cansubmit or !empty($filecount)) { //if a user has submitted files using a previous role we should still show the files
+ $this->view_feedback();
- $this->view_feedback();
-
- if (!$this->drafts_tracked() or !$this->isopen() or $this->is_finalized($submission)) {
- echo $OUTPUT->heading(get_string('submission', 'assignment'), 3);
- } else {
- echo $OUTPUT->heading(get_string('submissiondraft', 'assignment'), 3);
- }
+ if (!$this->drafts_tracked() or !$this->isopen() or $this->is_finalized($submission)) {
+ echo $OUTPUT->heading(get_string('submission', 'assignment'), 3);
+ } else {
+ echo $OUTPUT->heading(get_string('submissiondraft', 'assignment'), 3);
+ }
- if ($filecount and $submission) {
- echo $OUTPUT->box($this->print_user_files($USER->id, true), 'generalbox boxaligncenter', 'userfiles');
- } else {
- if (!$this->isopen() or $this->is_finalized($submission)) {
- echo $OUTPUT->box(get_string('nofiles', 'assignment'), 'generalbox boxaligncenter nofiles', 'userfiles');
+ if ($filecount and $submission) {
+ echo $OUTPUT->box($this->print_user_files($USER->id, true), 'generalbox boxaligncenter', 'userfiles');
} else {
- echo $OUTPUT->box(get_string('nofilesyet', 'assignment'), 'generalbox boxaligncenter nofiles', 'userfiles');
+ if (!$this->isopen() or $this->is_finalized($submission)) {
+ echo $OUTPUT->box(get_string('nofiles', 'assignment'), 'generalbox boxaligncenter nofiles', 'userfiles');
+ } else {
+ echo $OUTPUT->box(get_string('nofilesyet', 'assignment'), 'generalbox boxaligncenter nofiles', 'userfiles');
+ }
}
- }
- if (has_capability('mod/assignment:submit', $this->context)) {
$this->view_upload_form();
- }
- if ($this->notes_allowed()) {
- echo $OUTPUT->heading(get_string('notes', 'assignment'), 3);
- $this->view_notes();
- }
+ if ($this->notes_allowed()) {
+ echo $OUTPUT->heading(get_string('notes', 'assignment'), 3);
+ $this->view_notes();
+ }
- $this->view_final_submission();
+ $this->view_final_submission();
+ }
}
$this->view_footer();
}

0 comments on commit f672031

Please sign in to comment.