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

Merge branch 'w27_MDL-34036_m23_bulkrole' of git://github.com/skodak/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2012-07-03 11:40:14 +08:00
parent 0afd953daf 5df5bcba99
commit e570ee4b63
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/filters/courserole.php
+7 -8
View File
@@ -84,7 +84,7 @@ class user_filter_courserole extends user_filter_type {
function get_sql_filter($data) {
global $CFG, $DB;
static $counter = 0;
$name = 'ex_courserole'.$counter++;
$pref = 'ex_courserole'.($counter++).'_';
$value = $data['value'];
$roleid = $data['roleid'];
@@ -98,17 +98,16 @@ class user_filter_courserole extends user_filter_type {
$where = "b.contextlevel=50";
if ($roleid) {
$where .= " AND a.roleid = :roleid";
$params['roleid'] = $roleid;
$where .= " AND a.roleid = :{$pref}roleid";
$params[$pref.'roleid'] = $roleid;
}
if ($categoryid) {
$where .= " AND c.category = :categoryid";
$params['categoryid'] = $categoryid;
$where .= " AND c.category = :{$pref}categoryid";
$params[$pref.'categoryid'] = $categoryid;
}
if ($value) {
$where .= " AND c.shortname = :$name";
$params[$name] = $value;
$where .= " AND c.shortname = :{$pref}course";
$params[$pref.'course'] = $value;
}
return array("id IN (SELECT userid
FROM {role_assignments} a