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

MDL-13676 Changed a field so that Oracle can cope with a COALESCE statement. :-(

Browse Source 
I hate doing this at this late stage, but without it Oracle fails.

           On the way I also fixed the profile page so it displays role aliases if they exist
This commit is contained in:
moodler
2008-02-29 08:40:39 +00:00
parent 63b33f502d
commit f45aff70d9
9 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/accesslib.php
+14 -5
View File
@@ -4022,16 +4022,25 @@ function get_user_roles_in_context($userid, $context, $view=true){
$rolestring = '';
$SQL = 'select * from '.$CFG->prefix.'role_assignments ra, '.$CFG->prefix.'role r where ra.userid='.$userid.' and ra.contextid='.$context->id.' and ra.roleid = r.id';
$rolenames = array();
if ($roles = get_records_sql($SQL)) {
foreach ($roles as $userrole) {
// MDL-12544, if we are in view mode and current user has no capability to view hidden assignment, skip it
if ($userrole->hidden && $view && !has_capability('moodle/role:viewhiddenassigns', $context)) {
continue;
}
$rolenames[$userrole->roleid] = $userrole->name;
$rolestring .= '<a href="'.$CFG->wwwroot.'/user/index.php?contextid='.$userrole->contextid.'&amp;roleid='.$userrole->roleid.'">'.$userrole->name.'</a>, ';
}
$rolenames = role_fix_names($rolenames, $context); // Substitute aliases
foreach ($rolenames as $roleid => $rolename) {
$rolenames[$roleid] = '<a href="'.$CFG->wwwroot.'/user/index.php?contextid='.$context->id.'&amp;roleid='.$roleid.'">'.$rolename.'</a>';
}
$rolestring = implode(',', $rolenames);
}
return rtrim($rolestring, ', ');
return $rolestring;
}
@@ -4194,7 +4203,7 @@ function get_assignable_roles ($context, $field="name") {
// apply context role aliases if name requested
if ($field == 'name') {
$f = "COALESCE(rn.text, r.name) AS name";
$f = "COALESCE(rn.name, r.name) AS name";
} else {
$f = "r.$field";
}
@@ -4252,7 +4261,7 @@ function get_assignable_roles_for_switchrole ($context, $field="name") {
// apply context role aliases if name requested
if ($field == 'name') {
$f = "COALESCE(rn.text, r.name) AS name";
$f = "COALESCE(rn.name, r.name) AS name";
} else {
$f = "r.$field";
}
@@ -5279,7 +5288,7 @@ function user_has_role_assignment($userid, $roleid, $contextid=0) {
*/
function role_get_name($role, $coursecontext) {
if ($r = get_record('role_names','roleid', $role->id,'contextid', $coursecontext->id)) {
return strip_tags(format_string($r->text));
return strip_tags(format_string($r->name));
} else {
return strip_tags(format_string($role->name));
}
@@ -5295,7 +5304,7 @@ function role_fix_names($roleoptions, $coursecontext) {
if ($aliasnames = get_records('role_names', 'contextid', $coursecontext->id)) {
foreach ($aliasnames as $alias) {
if (isset($roleoptions[$alias->roleid])) {
$roleoptions[$alias->roleid] = $alias->text;
$roleoptions[$alias->roleid] = $alias->name;
}
}
}