From f5d3d0f498d188593b94d93e14682f7ce3f7fe5d Mon Sep 17 00:00:00 2001 From: David Monllao Date: Thu, 30 Oct 2014 15:56:34 +0800 Subject: [PATCH 1/2] MDL-47864 grade_report: Edulevels according to default user permissions --- .../overview/classes/event/grade_report_viewed.php | 9 +++++++++ grade/report/user/classes/event/grade_report_viewed.php | 9 +++++++++ lib/classes/event/grade_report_viewed.php | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/grade/report/overview/classes/event/grade_report_viewed.php b/grade/report/overview/classes/event/grade_report_viewed.php index 2b46bb6f1e3..4416a2fadc0 100644 --- a/grade/report/overview/classes/event/grade_report_viewed.php +++ b/grade/report/overview/classes/event/grade_report_viewed.php @@ -36,6 +36,15 @@ defined('MOODLE_INTERNAL') || die(); */ class grade_report_viewed extends \core\event\grade_report_viewed { + /** + * Initialise the event data. + * @return void + */ + protected function init() { + parent::init(); + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; + } + /** * Returns localised general event name. * diff --git a/grade/report/user/classes/event/grade_report_viewed.php b/grade/report/user/classes/event/grade_report_viewed.php index 46cbad9dbec..d87308adbfe 100644 --- a/grade/report/user/classes/event/grade_report_viewed.php +++ b/grade/report/user/classes/event/grade_report_viewed.php @@ -36,6 +36,15 @@ defined('MOODLE_INTERNAL') || die(); */ class grade_report_viewed extends \core\event\grade_report_viewed { + /** + * Initialise the event data. + * @return void + */ + protected function init() { + parent::init(); + $this->data['edulevel'] = self::LEVEL_PARTICIPATING; + } + /** * Returns localised general event name. * diff --git a/lib/classes/event/grade_report_viewed.php b/lib/classes/event/grade_report_viewed.php index 5356a504a90..9bc5b8450a4 100644 --- a/lib/classes/event/grade_report_viewed.php +++ b/lib/classes/event/grade_report_viewed.php @@ -48,7 +48,7 @@ abstract class grade_report_viewed extends base { $this->reporttype = $shorttype[1]; $this->data['crud'] = 'r'; - $this->data['edulevel'] = self::LEVEL_PARTICIPATING; + $this->data['edulevel'] = self::LEVEL_TEACHING; } /** From 0151ef57f5e9d70055b74949b29762461d8538b8 Mon Sep 17 00:00:00 2001 From: David Monllao Date: Fri, 31 Oct 2014 13:22:43 +0800 Subject: [PATCH 2/2] MDL-47864 tool_monitor: Change edulevels Considering that the most common use case to manage rules is an admin CRUDing them. --- admin/tool/monitor/classes/event/rule_created.php | 2 +- admin/tool/monitor/classes/event/rule_deleted.php | 2 +- admin/tool/monitor/classes/event/rule_updated.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/tool/monitor/classes/event/rule_created.php b/admin/tool/monitor/classes/event/rule_created.php index a5d6fe13884..178445b46a3 100644 --- a/admin/tool/monitor/classes/event/rule_created.php +++ b/admin/tool/monitor/classes/event/rule_created.php @@ -44,7 +44,7 @@ class rule_created extends \core\event\base { protected function init() { $this->data['objecttable'] = 'tool_monitor_rules'; $this->data['crud'] = 'c'; - $this->data['edulevel'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/admin/tool/monitor/classes/event/rule_deleted.php b/admin/tool/monitor/classes/event/rule_deleted.php index 988a5b63cbe..50e2d5b6628 100644 --- a/admin/tool/monitor/classes/event/rule_deleted.php +++ b/admin/tool/monitor/classes/event/rule_deleted.php @@ -44,7 +44,7 @@ class rule_deleted extends \core\event\base { protected function init() { $this->data['objecttable'] = 'tool_monitor_rules'; $this->data['crud'] = 'd'; - $this->data['edulevel'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_OTHER; } /** diff --git a/admin/tool/monitor/classes/event/rule_updated.php b/admin/tool/monitor/classes/event/rule_updated.php index c17da2d93cb..8b262c4f49d 100644 --- a/admin/tool/monitor/classes/event/rule_updated.php +++ b/admin/tool/monitor/classes/event/rule_updated.php @@ -44,7 +44,7 @@ class rule_updated extends \core\event\base { protected function init() { $this->data['objecttable'] = 'tool_monitor_rules'; $this->data['crud'] = 'u'; - $this->data['edulevel'] = self::LEVEL_TEACHING; + $this->data['edulevel'] = self::LEVEL_OTHER; } /**