Merge branch 'MDL-79962-403' of https://github.com/paulholden/moodle into MOODLE_403_STABLE

2023-11-15 16:47:39 +01:00
parent 7e4119de7e a502fbcd1e
commit 5f59e2a61e
1 changed files with 1 additions and 1 deletions
@@ -97,7 +97,7 @@ class role extends base {
            ->set_type(column::TYPE_TEXT)
            ->add_fields("{$rolealias}.name, {$rolealias}.shortname, {$rolealias}.id, {$contextalias}.id AS contextid")
            ->add_fields(context_helper::get_preload_record_columns_sql($contextalias))
-            ->set_is_sortable(true)
+            ->set_is_sortable(true, ["CASE WHEN {$rolealias}.name = '' THEN {$rolealias}.shortname ELSE {$rolealias}.name END"])
            ->set_callback(static function($name, stdClass $role): string {
                if ($name === null) {
                    return '';