Browse Source

Show display_text see BT#12502

jmontoyaa 8 years ago
parent
commit
c01773a20a
1 changed files with 14 additions and 2 deletions
  1. 14 2
      main/user/user.php

+ 14 - 2
main/user/user.php

@@ -879,14 +879,26 @@ function get_user_data($from, $number_of_items, $column, $direction)
                 // Active
                 $temp[] = $o_course_user['active'];
 
+                $extraFieldOption = new ExtraFieldOption('user');
+                $extraFieldValue = new ExtraFieldValue('user');
+
                 if (!empty($extraFields)) {
                     foreach ($extraFields as $extraField) {
-                        $extraFieldValue = new ExtraFieldValue('user');
                         $data = $extraFieldValue->get_values_by_handler_and_field_id(
                             $user_id,
                             $extraField['id']
                         );
-                        $temp[] = $data['value'];
+
+                        $optionList = $extraFieldOption->get_field_option_by_field_and_option(
+                            $extraField['id'],
+                            $data['value']
+                        );
+                        if (!empty($optionList)) {
+                            $options = implode(', ', array_column($optionList, 'display_text'));
+                            $temp[] = $options;
+                        } else {
+                            $temp[] = $data['value'];
+                        }
                     }
                 }