Merge branch 'MDL-63820' of git://github.com/albertgasset/moodle

This commit is contained in:
Jun Pataleta
2018-10-31 16:01:40 +08:00
2 changed files with 12 additions and 1 deletions
@@ -600,6 +600,14 @@ class assign_feedback_comments extends assign_feedback_plugin {
return $this->view($grade) == '';
}
/**
* Get file areas returns a list of areas this plugin stores files
* @return array - An array of fileareas (keys) and descriptions (values)
*/
public function get_file_areas() {
return array(ASSIGNFEEDBACK_COMMENTS_FILEAREA => $this->get_name());
}
/**
* Return a description of external params suitable for uploading an feedback comment from a webservice.
*
+4 -1
View File
@@ -3501,11 +3501,14 @@ Anchor link 2:<a title=\"bananas\" href=\"../logo-240x60.gif\">Link text</a>
} else if ($type == 'file') {
$this->assertEquals(array('feedback_files' => 'Feedback files'), $fileareas);
$usingfilearea++;
} else if ($type == 'comments') {
$this->assertEquals(array('feedback' => 'Feedback comments'), $fileareas);
$usingfilearea++;
} else {
$this->assertEmpty($fileareas);
}
}
$this->assertEquals(2, $usingfilearea);
$this->assertEquals(3, $usingfilearea);
}
/**