From: nfreear <nfreear>
Date: Tue, 11 Dec 2007 12:58:37 +0000 (+0000)
Subject: Fixes MDL-12539 "Help link text for all admin/user filters are broken".
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3b726c87a30e6722823bf9c3bc516a89fe153aaa;p=moodle.git

Fixes MDL-12539 "Help link text for all admin/user filters are broken".
---

diff --git a/user/filters/courserole.php b/user/filters/courserole.php
index 6c4564f569..9d6c23fce9 100644
--- a/user/filters/courserole.php
+++ b/user/filters/courserole.php
@@ -47,7 +47,7 @@ class user_filter_courserole extends user_filter_type {
         $objs[] =& $mform->createElement('select', $this->_name .'_ct', null, $this->get_course_categories());
         $objs[] =& $mform->createElement('text', $this->_name, null);
         $grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
-        $grp->setHelpButton(array('courserole', '', 'filters'));
+        $grp->setHelpButton(array('courserole', $this->_label, 'filters'));
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name.'_grp');
         }
diff --git a/user/filters/date.php b/user/filters/date.php
index 98b734bee1..17e72f772a 100755
--- a/user/filters/date.php
+++ b/user/filters/date.php
@@ -35,7 +35,7 @@ class user_filter_date extends user_filter_type {
         $objs[] =& $mform->createElement('checkbox', $this->_name.'_eck', null, get_string('isbefore', 'filters'));
         $objs[] =& $mform->createElement('date_selector', $this->_name.'_edt', null);
         $grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
-        $grp->setHelpButton(array('date','','filters'));
+        $grp->setHelpButton(array('date',$this->_label,'filters'));
 
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name.'_grp');
diff --git a/user/filters/globalrole.php b/user/filters/globalrole.php
index 53a03ee3b3..b8781dfcd1 100644
--- a/user/filters/globalrole.php
+++ b/user/filters/globalrole.php
@@ -33,7 +33,7 @@ class user_filter_globalrole extends user_filter_type {
      */
     function setupForm(&$mform) {
         $obj =& $mform->addElement('select', $this->_name, $this->_label, $this->get_roles());
-        $obj->setHelpButton(array('globalrole', '', 'filters'));
+        $obj->setHelpButton(array('globalrole', $this->_label, 'filters'));
         $mform->setDefault($this->_name, 0);
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name);
diff --git a/user/filters/profilefield.php b/user/filters/profilefield.php
index bb7fefcb4e..454a4e23c1 100644
--- a/user/filters/profilefield.php
+++ b/user/filters/profilefield.php
@@ -61,7 +61,7 @@ class user_filter_profilefield extends user_filter_type {
         $objs[] =& $mform->createElement('select', $this->_name.'_op', null, $this->get_operators());
         $objs[] =& $mform->createElement('text', $this->_name, null);
         $grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
-        $grp->setHelpButton(array('profilefield','','filters'));
+        $grp->setHelpButton(array('profilefield',$this->_label,'filters'));
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name.'_grp');
         }
diff --git a/user/filters/select.php b/user/filters/select.php
index 7498c55cff..49c6e3bb74 100644
--- a/user/filters/select.php
+++ b/user/filters/select.php
@@ -50,7 +50,7 @@ class user_filter_select extends user_filter_type {
         $objs[] =& $mform->createElement('select', $this->_name.'_op', null, $this->get_operators());
         $objs[] =& $mform->createElement('select', $this->_name, null, $this->_options);
         $grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
-        $grp->setHelpButton(array('select', '', 'filters'));
+        $grp->setHelpButton(array('select', $this->_label, 'filters'));
         $mform->disabledIf($this->_name, $this->_name.'_op', 'eq', 0);
         if (!is_null($this->_default)) {
             $mform->setDefault($this->_name, $this->_default);
diff --git a/user/filters/simpleselect.php b/user/filters/simpleselect.php
index 81062cea4d..94e7578035 100644
--- a/user/filters/simpleselect.php
+++ b/user/filters/simpleselect.php
@@ -34,7 +34,7 @@ class user_filter_simpleselect extends user_filter_type {
     function setupForm(&$mform) {
         $choices = array(''=>get_string('anyvalue', 'filters')) + $this->_options;
         $mform->addElement('select', $this->_name, $this->_label, $choices);
-        $mform->setHelpButton($this->_name, array('simpleselect', '', 'filters'));
+        $mform->setHelpButton($this->_name, array('simpleselect', $this->_label, 'filters'));
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name);
         }
diff --git a/user/filters/text.php b/user/filters/text.php
index b92624be03..24d5497d77 100644
--- a/user/filters/text.php
+++ b/user/filters/text.php
@@ -42,7 +42,7 @@ class user_filter_text extends user_filter_type {
         $objs[] =& $mform->createElement('select', $this->_name.'_op', null, $this->getOperators());
         $objs[] =& $mform->createElement('text', $this->_name, null);
         $grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
-        $grp->setHelpButton(array('text','','filters'));
+        $grp->setHelpButton(array('text',$this->_label,'filters'));
         $mform->disabledIf($this->_name, $this->_name.'_op', 'eq', 5);
         if ($this->_advanced) {
             $mform->setAdvanced($this->_name.'_grp');