Merge branch 'MDL-62811' of git://github.com/timhunt/moodle

This commit is contained in:
Jun Pataleta 2018-07-18 16:12:16 +08:00 committed by Andrew Nicols
commit a766f5dc00
3 changed files with 80 additions and 3 deletions

View file

@ -38,8 +38,12 @@ abstract class action_column_base extends column_base {
echo '<a title="' . $title . '" href="' . $url . '">' . $OUTPUT->pix_icon($icon, $title) . '</a>';
}
public function get_extra_joins() {
return array('qc' => 'JOIN {question_categories} qc ON qc.id = q.category');
}
public function get_required_fields() {
// Createdby is required for permission checks.
return array('q.id', 'q.createdby');
return array('q.id', 'q.createdby', 'qc.contextid');
}
}

View file

@ -69,8 +69,8 @@ class view {
/**
* Constructor
* @param question_edit_contexts $contexts
* @param moodle_url $pageurl
* @param \question_edit_contexts $contexts
* @param \moodle_url $pageurl
* @param object $course course settings
* @param object $cm (optional) activity settings.
*/