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

This commit is contained in:
Dan Poltawski 2014-10-23 17:30:28 +01:00 committed by Eloy Lafuente (stronk7)
commit 0255780b9c
2 changed files with 0 additions and 30 deletions

View file

@ -244,30 +244,7 @@ class question_type {
public function display_question_editing_page($mform, $question, $wizardnow) { public function display_question_editing_page($mform, $question, $wizardnow) {
global $OUTPUT; global $OUTPUT;
$heading = $this->get_heading(empty($question->id)); $heading = $this->get_heading(empty($question->id));
echo $OUTPUT->heading_with_help($heading, 'pluginname', $this->plugin_name()); echo $OUTPUT->heading_with_help($heading, 'pluginname', $this->plugin_name());
$permissionstrs = array();
if (!empty($question->id)) {
if ($question->formoptions->canedit) {
$permissionstrs[] = get_string('permissionedit', 'question');
}
if ($question->formoptions->canmove) {
$permissionstrs[] = get_string('permissionmove', 'question');
}
if ($question->formoptions->cansaveasnew) {
$permissionstrs[] = get_string('permissionsaveasnew', 'question');
}
}
if (count($permissionstrs)) {
echo $OUTPUT->heading(get_string('permissionto', 'question'), 3);
$html = '<ul>';
foreach ($permissionstrs as $permissionstr) {
$html .= '<li>'.$permissionstr.'</li>';
}
$html .= '</ul>';
echo $OUTPUT->box($html, 'boxwidthnarrow boxaligncenter generalbox');
}
$mform->display(); $mform->display();
} }

View file

@ -115,13 +115,6 @@ class qtype_random extends question_type {
$this->manualqtypes = implode(',', $manualqtypes); $this->manualqtypes = implode(',', $manualqtypes);
} }
public function display_question_editing_page($mform, $question, $wizardnow) {
global $OUTPUT;
$heading = $this->get_heading(empty($question->id));
echo $OUTPUT->heading_with_help($heading, 'pluginname', $this->plugin_name());
$mform->display();
}
public function get_question_options($question) { public function get_question_options($question) {
return true; return true;
} }