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

Merge branch 'MDL-47361_master' of https://github.com/markn86/moodle

Browse Source 
Conflicts:
	admin/tool/monitor/edit.php
	admin/tool/monitor/lang/en/tool_monitor.php
This commit is contained in:
Dan Poltawski
2014-11-03 13:55:31 +00:00
parent 1a27142afe 8ad2de40b1
commit e3d86c322b
16 changed files with 500 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/monitor/edit.php
+16 -7
View File
@@ -44,17 +44,12 @@ if (empty($courseid)) {
require_capability('tool/monitor:managerules', $context);
// Set up the page.
$a = new stdClass();
$a->coursename = $coursename;
$a->reportname = get_string('pluginname', 'tool_monitor');
$title = get_string('title', 'tool_monitor', $a);
$url = new moodle_url("/admin/tool/monitor/edit.php", array('courseid' => $courseid, 'ruleid' => $ruleid));
$manageurl = new moodle_url("/admin/tool/monitor/managerules.php", array('courseid' => $courseid));
$PAGE->set_url($url);
$PAGE->set_pagelayout('report');
$PAGE->set_title($title);
$PAGE->set_heading($title);
$PAGE->set_title($coursename);
$PAGE->set_heading($coursename);
// Get data ready for mform.
$eventlist = tool_monitor\eventlist::get_all_eventlist(true);
@@ -87,6 +82,11 @@ if (!empty($ruleid)) {
$mform = new tool_monitor\rule_form(null, array('eventlist' => $eventlist, 'pluginlist' => $pluginlist, 'rule' => $rule,
'courseid' => $courseid, 'subscriptioncount' => $subscriptioncount));
if ($mform->is_cancelled()) {
redirect(new moodle_url('/admin/tool/monitor/managerules.php', array('courseid' => $courseid)));
exit();
}
if ($mformdata = $mform->get_data()) {
$rule = \tool_monitor\rule_manager::clean_ruledata_form($mformdata);
@@ -108,3 +108,12 @@ if ($mformdata = $mform->get_data()) {
echo $OUTPUT->footer();
}
echo $OUTPUT->header();
if (!empty($ruleid)) {
echo $OUTPUT->heading(get_string('editrule', 'tool_monitor'));
} else {
echo $OUTPUT->heading(get_string('addrule', 'tool_monitor'));
}
$mform->set_data($rule);
$mform->display();
echo $OUTPUT->footer();