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

Merge branch 'MDL-47782-master' of git://github.com/lameze/moodle

Browse Source 
Conflicts:
	admin/tool/monitor/lang/en/tool_monitor.php
This commit is contained in:
Dan Poltawski
2014-10-24 15:25:42 +01:00
parent 22ef599c5d 7bd88b0039
commit f6dbc2bb9c
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/monitor/classes/output/managerules/renderable.php
+14 -1
View File
@@ -64,11 +64,13 @@ class renderable extends \table_sql implements \renderable {
public function __construct($uniqueid, \moodle_url $url, $courseid = 0, $perpage = 100) {
parent::__construct($uniqueid);
$this->set_attribute('id', 'toolmonitorrules_table');
$this->set_attribute('class', 'toolmonitor managerules generaltable generalbox');
$this->define_columns(array('name', 'description', 'plugin', 'eventname', 'filters', 'manage'));
$this->define_columns(array('name', 'description', 'context', 'plugin', 'eventname', 'filters', 'manage'));
$this->define_headers(array(
get_string('name'),
get_string('description'),
get_string('context', 'tool_monitor'),
get_string('plugin'),
get_string('eventname'),
get_string('frequency', 'tool_monitor'),
@@ -198,4 +200,15 @@ class renderable extends \table_sql implements \renderable {
$this->initialbars($total > $pagesize);
}
}
/**
* Generate content for context column.
*
* @param \tool_monitor\rule $rule rule object
*
* @return string html used to display the context column field.
*/
public function col_context(\tool_monitor\rule $rule) {
return ($rule->courseid == 0) ? get_string('system', 'tool_monitor') : get_string('course');
}
}