mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 08:55:15 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'm29_MDL-48519' of https://github.com/totara/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2015-02-24 17:51:22 +08:00
commit b6daeec8bd
7 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/en/filters.php
View File

@ -34,9 +34,11 @@ $string['categoryrole'] = 'Category role';
$string['contains'] = 'contains';
$string['content'] = 'Content';
$string['contentandheadings'] = 'Content and headings';
$string['coursecategory'] = 'course category';
$string['courserole'] = 'Course role';
$string['courserolelabel'] = '{$a->label} is {$a->rolename} in {$a->coursename} from {$a->categoryname}';
$string['courserolelabelerror'] = '{$a->label} error: course {$a->coursename} does not exist';
$string['coursevalue'] = 'course value';
$string['datelabelisafter'] = '{$a->label} is after {$a->after}';
$string['datelabelisbefore'] = '{$a->label} is before {$a->before}';
$string['datelabelisbetween'] = '{$a->label} is between {$a->after} and {$a->before}';
@ -62,6 +64,7 @@ $string['isempty'] = 'is empty';
$string['isequalto'] = 'is equal to';
$string['isnotdefined'] = 'isn\'t defined';
$string['isnotequalto'] = 'isn\'t equal to';
$string['limiterfor'] = '{$a} field limiter';
$string['neveraccessed'] = 'Never accessed';
$string['nevermodified'] = 'Never modified';
$string['newfilter'] = 'New filter';
@ -69,6 +72,8 @@ $string['nofiltersenabled'] = 'No filter plugins have been enabled on this site.
$string['off'] = 'Off';
$string['offbutavailable'] = 'Off, but available';
$string['on'] = 'On';
$string['profilefilterfield'] = 'Profile field name';
$string['profilefilterlimiter'] = 'Profile field operator';
$string['profilelabel'] = '{$a->label}: {$a->profile} {$a->operator} {$a->value}';
$string['profilelabelnovalue'] = '{$a->label}: {$a->profile} {$a->operator}';
$string['removeall'] = 'Remove all filters';
@ -78,3 +83,4 @@ $string['startswith'] = 'starts with';
$string['tablenosave'] = 'Changes in table above are saved automatically.';
$string['textlabel'] = '{$a->label} {$a->operator} {$a->value}';
$string['textlabelnovalue'] = '{$a->label} {$a->operator}';
$string['valuefor'] = '{$a} value';

7
user/filters/checkbox.php
View File

@ -76,13 +76,10 @@ class user_filter_checkbox extends user_filter_type {
* @param moodleform $mform a MoodleQuickForm object in which element will be added
*/
public function setupForm(&$mform) {
$objs = array();
$objs[] = $mform->createElement('checkbox', $this->_name, null, '');
$grp = $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
$mform->addElement('checkbox', $this->_name, $this->_label, '');
if ($this->_advanced) {
$mform->setAdvanced($this->_name.'_grp');
$mform->setAdvanced($this->_name);
}
// Check if disable if options are set. if yes then set rules.
if (!empty($this->disableelements) && is_array($this->disableelements)) {

6
user/filters/cohort.php
View File

@ -60,8 +60,10 @@ class user_filter_cohort extends user_filter_type {
*/
public function setupForm(&$mform) {
$objs = array();
$objs[] = $mform->createElement('select', $this->_name.'_op', null, $this->getOperators());
$objs[] = $mform->createElement('text', $this->_name, null);
$objs['select'] = $mform->createElement('select', $this->_name.'_op', null, $this->getOperators());
$objs['text'] = $mform->createElement('text', $this->_name, null);
$objs['select']->setLabel(get_string('limiterfor', 'filters', $this->_label));
$objs['text']->setLabel(get_string('valuefor', 'filters', $this->_label));
$grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
$mform->setType($this->_name, PARAM_RAW);
$mform->disabledIf($this->_name, $this->_name.'_op', 'eq', 5);

9
user/filters/courserole.php
View File

@ -67,9 +67,12 @@ class user_filter_courserole extends user_filter_type {
*/
public function setupForm(&$mform) {
$objs = array();
$objs[] = $mform->createElement('select', $this->_name .'_rl', null, $this->get_roles());
$objs[] = $mform->createElement('select', $this->_name .'_ct', null, $this->get_course_categories());
$objs[] = $mform->createElement('text', $this->_name, null);
$objs['role'] = $mform->createElement('select', $this->_name .'_rl', null, $this->get_roles());
$objs['role']->setLabel(get_string('courserole', 'filters'));
$objs['category'] = $mform->createElement('select', $this->_name .'_ct', null, $this->get_course_categories());
$objs['category']->setLabel(get_string('coursecategory', 'filters'));
$objs['value'] = $mform->createElement('text', $this->_name, null);
$objs['value']->setLabel(get_string('coursevalue', 'filters'));
$grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
$mform->setType($this->_name, PARAM_TEXT);
if ($this->_advanced) {

9
user/filters/profilefield.php
View File

@ -84,9 +84,12 @@ class user_filter_profilefield extends user_filter_type {
return;
}
$objs = array();
$objs[] = $mform->createElement('select', $this->_name.'_fld', null, $profilefields);
$objs[] = $mform->createElement('select', $this->_name.'_op', null, $this->get_operators());
$objs[] = $mform->createElement('text', $this->_name, null);
$objs['field'] = $mform->createElement('select', $this->_name.'_fld', null, $profilefields);
$objs['op'] = $mform->createElement('select', $this->_name.'_op', null, $this->get_operators());
$objs['value'] = $mform->createElement('text', $this->_name, null);
$objs['field']->setLabel(get_string('profilefilterfield', 'filters'));
$objs['op']->setLabel(get_string('profilefilterlimiter', 'filters'));
$objs['value']->setLabel(get_string('valuefor', 'filters', $this->_label));
$grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
$mform->setType($this->_name, PARAM_RAW);
if ($this->_advanced) {

6
user/filters/select.php
View File

@ -75,8 +75,10 @@ class user_filter_select extends user_filter_type {
*/
public function setupForm(&$mform) {
$objs = array();
$objs[] = $mform->createElement('select', $this->_name.'_op', null, $this->get_operators());
$objs[] = $mform->createElement('select', $this->_name, null, $this->_options);
$objs['limiter'] = $mform->createElement('select', $this->_name.'_op', null, $this->get_operators());
$objs['limiter']->setLabel(get_string('limiterfor', 'filters', $this->_label));
$objs['country'] = $mform->createElement('select', $this->_name, null, $this->_options);
$objs['country']->setLabel(get_string('valuefor', 'filters', $this->_label));
$grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
$mform->disabledIf($this->_name, $this->_name.'_op', 'eq', 0);
if (!is_null($this->_default)) {

6
user/filters/text.php
View File

@ -65,8 +65,10 @@ class user_filter_text extends user_filter_type {
*/
public function setupForm(&$mform) {
$objs = array();
$objs[] = $mform->createElement('select', $this->_name.'_op', null, $this->getOperators());
$objs[] = $mform->createElement('text', $this->_name, null);
$objs['select'] = $mform->createElement('select', $this->_name.'_op', null, $this->getOperators());
$objs['text'] = $mform->createElement('text', $this->_name, null);
$objs['select']->setLabel(get_string('limiterfor', 'filters', $this->_label));
$objs['text']->setLabel(get_string('valuefor', 'filters', $this->_label));
$grp =& $mform->addElement('group', $this->_name.'_grp', $this->_label, $objs, '', false);
$mform->setType($this->_name, PARAM_RAW);
$mform->disabledIf($this->_name, $this->_name.'_op', 'eq', 5);