mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
MDL-19797 Migrated choose_from_menu to the new $OUTPUT->select_menu() function
This commit is contained in:
parent
db8935ef42
commit
0a95bebf59
3 changed files with 24 additions and 5 deletions
|
@ -216,3 +216,13 @@ YAHOO.namespace('grade_edit_tree');
|
||||||
});
|
});
|
||||||
// YAHOO.util.Event.onDOMReady(gretree.DDApp.init, gretree.DDApp, true); // Uncomment this line when dragdrop is fully implemented
|
// YAHOO.util.Event.onDOMReady(gretree.DDApp.init, gretree.DDApp, true); // Uncomment this line when dragdrop is fully implemented
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
function submit_bulk_move(e, args) {
|
||||||
|
document.getElementById('bulkmoveinput').value = 1;
|
||||||
|
document.getElementById('gradetreeform').submit();
|
||||||
|
}
|
||||||
|
|
||||||
|
function update_category_aggregation(e, args) {
|
||||||
|
var selectmenu = e.target;
|
||||||
|
window.location = 'index.php?id='+args.courseid+'&category='+args.category+'&aggregationtype='+selectmenu.value+'&sesskey='+args.sesskey;
|
||||||
|
}
|
||||||
|
|
|
@ -309,8 +309,13 @@ if (!$moving && count($categories) > 1) {
|
||||||
echo '<br /><br />';
|
echo '<br /><br />';
|
||||||
echo '<input type="hidden" name="bulkmove" value="0" id="bulkmoveinput" />';
|
echo '<input type="hidden" name="bulkmove" value="0" id="bulkmoveinput" />';
|
||||||
echo get_string('moveselectedto', 'grades') . ' ';
|
echo get_string('moveselectedto', 'grades') . ' ';
|
||||||
echo choose_from_menu($categories, 'moveafter', '', 'choose',
|
$selectmenu = new moodle_select_menu();
|
||||||
'document.getElementById(\'bulkmoveinput\').value=1;document.getElementById(\'gradetreeform\').submit()', 0, true, true);
|
$selectmenu->options = $categories;
|
||||||
|
$selectmenu->name = 'moveafter';
|
||||||
|
$selectmenu->disabled = true;
|
||||||
|
$selectmenu->id = 'menumoveafter';
|
||||||
|
$selectmenu->add_action('change', 'submit_bulk_move');
|
||||||
|
echo $OUTPUT->select_menu($selectmenu);
|
||||||
echo '<div id="noscriptgradetreeform" style="display: inline;">
|
echo '<div id="noscriptgradetreeform" style="display: inline;">
|
||||||
<input type="submit" value="'.get_string('go').'" />
|
<input type="submit" value="'.get_string('go').'" />
|
||||||
</div>';
|
</div>';
|
||||||
|
|
|
@ -542,7 +542,7 @@ class grade_edit_tree_column_aggregation extends grade_edit_tree_column_category
|
||||||
}
|
}
|
||||||
|
|
||||||
public function get_category_cell($category, $levelclass, $params) {
|
public function get_category_cell($category, $levelclass, $params) {
|
||||||
global $CFG;
|
global $CFG, $OUTPUT;
|
||||||
if (empty($params['id'])) {
|
if (empty($params['id'])) {
|
||||||
throw new Exception('Array key (id) missing from 3rd param of grade_edit_tree_column_aggregation::get_category_cell($category, $levelclass, $params)');
|
throw new Exception('Array key (id) missing from 3rd param of grade_edit_tree_column_aggregation::get_category_cell($category, $levelclass, $params)');
|
||||||
}
|
}
|
||||||
|
@ -564,8 +564,12 @@ class grade_edit_tree_column_aggregation extends grade_edit_tree_column_category
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$script = "window.location='index.php?id={$params['id']}&category={$category->id}&aggregationtype='+this.value+'&sesskey=" . sesskey()."';";
|
$selectmenu = new moodle_select_menu();
|
||||||
$aggregation = choose_from_menu($options, 'aggregation_'.$category->id, $category->aggregation, null, $script, 0, true);
|
$selectmenu->options = $options;
|
||||||
|
$selectmenu->name = 'aggregation_'.$category->id;
|
||||||
|
$selectmenu->selectedvalue = $category->aggregation;
|
||||||
|
$selectmenu->add_action('change', 'update_category_aggregation', array('courseid' => $params['id'], 'category' => $category->id, 'sesskey' => sesskey()));
|
||||||
|
$aggregation = $OUTPUT->select_menu($selectmenu);
|
||||||
|
|
||||||
if ($this->forced) {
|
if ($this->forced) {
|
||||||
$aggregation = $options[$category->aggregation];
|
$aggregation = $options[$category->aggregation];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue