MDL-47361 tool_monitor: added missing column

Also reworded a string as the fields have been renamed.
moodle · Nov 4, 2014 · 4e86f45 · 4e86f45
1 parent 888d082
commit 4e86f45
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/admin/tool/monitor/classes/output/managesubs/subs.php b/admin/tool/monitor/classes/output/managesubs/subs.php
@@ -60,12 +60,14 @@ public function __construct($uniqueid, \moodle_url $url, $courseid = 0, $perpage
         parent::__construct($uniqueid);
 
         $this->set_attribute('class', 'toolmonitor subscriptions generaltable generalbox');
-        $this->define_columns(array('name', 'description', 'course', 'plugin', 'eventname', 'filters', 'unsubscribe'));
+        $this->define_columns(array('name', 'description', 'course', 'plugin', 'instance', 'eventname',
+            'filters', 'unsubscribe'));
         $this->define_headers(array(
                 get_string('rulename', 'tool_monitor'),
                 get_string('description'),
                 get_string('course'),
                 get_string('area', 'tool_monitor'),
+                get_string('moduleinstance', 'tool_monitor'),
                 get_string('event', 'tool_monitor'),
                 get_string('frequency', 'tool_monitor'),
                 get_string('unsubscribe', 'tool_monitor')
@@ -129,6 +131,16 @@ public function col_plugin(\tool_monitor\subscription $sub) {
         return $sub->get_plugin_name();
     }
 
+    /**
+     * Generate content for instance column.
+     *
+     * @param \tool_monitor\subscription $sub subscription object
+     * @return string html used to display the instance name.
+     */
+    public function col_instance(\tool_monitor\subscription $sub) {
+        return $sub->get_instance_name();
+    }
+
     /**
      * Generate content for eventname column.
      *

diff --git a/admin/tool/monitor/lang/en/tool_monitor.php b/admin/tool/monitor/lang/en/tool_monitor.php
@@ -35,7 +35,7 @@
 $string['deleterule'] = 'Delete rule';
 $string['deletesubscription'] = 'Delete subscription';
 $string['description'] = 'Description:';
-$string['disablefieldswarning'] = 'Plugin and events fields can not be edited because this rule already has subscriptions.';
+$string['disablefieldswarning'] = 'Some fields can not be edited as this rule already has subscriptions.';
 $string['duplicaterule'] = 'Duplicate rule';
 $string['editrule'] = 'Edit rule';
 $string['event'] = 'Event';
@@ -67,6 +67,7 @@
 * Rule name {rulename}<br />
 * Description {description}<br />
 * Event {eventname}';
+$string['moduleinstance'] = 'Instance';
 $string['monitor:managerules'] = 'Manage event monitor rules';
 $string['monitor:subscribe'] = 'Subscribe to event monitor rules';
 $string['norules'] = 'There are no event monitoring rules.';