L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-45758 tool_monitor: Update js to get around chrome bug

Browse Source
This commit is contained in:
Ankit Agarwal
2014-10-15 07:41:06 +05:30
parent 75cae53b7b
commit e8a925a60e
6 changed files with 90 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/monitor/edit.php
+11 -4
View File
@@ -55,7 +55,16 @@ $PAGE->set_url($url);
$PAGE->set_pagelayout('report');
$PAGE->set_title($title);
$PAGE->set_heading($title);
$PAGE->requires->yui_module('moodle-tool_monitor-dropdown', 'Y.M.tool_monitor.DropDown.init');
// Get data ready for mform.
$eventlist = tool_monitor\eventlist::get_all_eventlist(true);
$pluginlist = tool_monitor\eventlist::get_plugin_list();
$eventlist = array_merge(array('' => get_string('choosedots')), $eventlist);
$pluginlist = array_merge(array('' => get_string('choosedots')), $pluginlist);
// Set up the yui module.
$PAGE->requires->yui_module('moodle-tool_monitor-dropdown', 'Y.M.tool_monitor.DropDown.init',
array(array('eventlist' => $eventlist)));
// Site level report.
if (empty($courseid)) {
@@ -65,9 +74,7 @@ if (empty($courseid)) {
$PAGE->navigation->override_active_url($manageurl);
}
// Get data ready for mform.
$eventlist = tool_monitor\eventlist::get_all_eventlist(true);
$pluginlist = tool_monitor\eventlist::get_plugin_list();
// Mform setup.
if (!empty($ruleid)) {
$rule = \tool_monitor\rule_manager::get_rule($ruleid)->get_mform_set_data();
$rule->minutes = $rule->timewindow / MINSECS;