mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-06 16:26:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-46818_master' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
Marina Glancy 2014-09-08 14:04:33 +08:00
commit aea49eb5f9
2 changed files with 9 additions and 0 deletions
grade/edit/tree
index.phplib.php

8
grade/edit/tree/index.php

@ -368,6 +368,14 @@ if ($moving) {
echo $OUTPUT->container_end(); echo $OUTPUT->container_end();
$PAGE->requires->yui_module('moodle-core-formchangechecker',
'M.core_formchangechecker.init',
array(array(
'formid' => 'gradetreeform'
))
);
$PAGE->requires->string_for_js('changesmadereallygoaway', 'moodle');
echo $OUTPUT->footer(); echo $OUTPUT->footer();
// Restore original show/hide preference if moving // Restore original show/hide preference if moving

1
grade/edit/tree/lib.php

@ -671,6 +671,7 @@ class grade_edit_tree_column_aggregation extends grade_edit_tree_column_category
} else { } else {
$attributes = array(); $attributes = array();
$attributes['id'] = 'aggregation_'.$category->id; $attributes['id'] = 'aggregation_'.$category->id;
$attributes['class'] = 'ignoredirty';
$aggregation = html_writer::label(get_string('aggregation', 'grades'), 'aggregation_'.$category->id, false, array('class' => 'accesshide')); $aggregation = html_writer::label(get_string('aggregation', 'grades'), 'aggregation_'.$category->id, false, array('class' => 'accesshide'));
$aggregation .= html_writer::select($options, 'aggregation_'.$category->id, $category->aggregation, null, $attributes); $aggregation .= html_writer::select($options, 'aggregation_'.$category->id, $category->aggregation, null, $attributes);
$action = new component_action('change', 'update_category_aggregation', array('courseid' => $params['id'], 'category' => $category->id, 'sesskey' => sesskey())); $action = new component_action('change', 'update_category_aggregation', array('courseid' => $params['id'], 'category' => $category->id, 'sesskey' => sesskey()));