MDL-19797 Migrated choose_from_menu to the new $OUTPUT->select_menu() function

diff --git a/grade/edit/tree/functions.js b/grade/edit/tree/functions.js
index a10c459754bd84b864d2dfe4b773122de59db0d3..64f30ae66768417fe0dbcbe8f2abaf990aa74d85 100755 (executable)
--- a/grade/edit/tree/functions.js
+++ b/grade/edit/tree/functions.js
@@ -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
 })();
+
+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;
+}

diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php
index 88e4c3993751f5f1dde2fb659a3ae2a81df6101e..7b71f6f536c83a56b2fa0ab558d748313ab38403 100644 (file)
--- a/grade/edit/tree/index.php
+++ b/grade/edit/tree/index.php
@@ -309,8 +309,13 @@ if (!$moving && count($categories) > 1) {
     echo '<br /><br />';
     echo '<input type="hidden" name="bulkmove" value="0" id="bulkmoveinput" />';
     echo get_string('moveselectedto', 'grades') . ' ';
-    echo choose_from_menu($categories, 'moveafter', '', 'choose',
-            'document.getElementById(\'bulkmoveinput\').value=1;document.getElementById(\'gradetreeform\').submit()', 0, true, true);
+    $selectmenu = new moodle_select_menu();
+    $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;">
             <input type="submit" value="'.get_string('go').'" />
           </div>';

diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
index 9e2c44eb36bb45ae1c101baac45f3c6d0b80c520..c1b71e34ac57bda87e1a260bb42d0ff85a05695f 100755 (executable)
--- a/grade/edit/tree/lib.php
+++ b/grade/edit/tree/lib.php
@@ -542,7 +542,7 @@ class grade_edit_tree_column_aggregation extends grade_edit_tree_column_category
     }
 
     public function get_category_cell($category, $levelclass, $params) {
-        global $CFG;
+        global $CFG, $OUTPUT;
         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)');
         }
@@ -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()."';";
-        $aggregation = choose_from_menu($options, 'aggregation_'.$category->id, $category->aggregation, null, $script, 0, true);
+        $selectmenu = new moodle_select_menu();
+        $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) {
             $aggregation = $options[$category->aggregation];