ELIS-8982: Fix Course Completion By Userset report cluster role filte…

…r dropdown empty.
terrycampbell · Jan 4, 2015 · c742766 · c742766
1 parent 03515d0
commit c742766
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/instances/course_completion_by_cluster/course_completion_by_cluster_report.class.php b/instances/course_completion_by_cluster/course_completion_by_cluster_report.class.php
@@ -175,17 +175,18 @@ function get_filters($init_data = true) {
                                  'heading'    => $heading_label,
                                  'nofilter'   => true);
 
-        //cluster role dropdown
-        $clusterrole_choices = array();
+        // Cluster role dropdown.
+        $clusterrolechoices = array();
         if ($roles = get_all_roles()) {
             foreach ($roles as $role) {
-                $clusterrole_choices[$role->id] = $role->name;
+                $clusterrolechoices[$role->id] = strip_tags(format_string(!empty($role->name) ? $role->name : $role->shortname, true));
             }
         }
 
-        $clusterrole_options = array('choices'  => $clusterrole_choices,
-                                     'numeric'  => true,
-                                     'nofilter' => true);
+        $clusterrole_options = array(
+            'choices'  => $clusterrolechoices,
+            'numeric'  => true,
+            'nofilter' => true);
 
         //cluster tree / dropdown filter
         $cluster_heading = get_string('filter_cluster', 'rlreport_course_completion_by_cluster');