Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

user popover: Fix choice field shows index of selected choice instead value. 

Choice type of custom field, displays index of selected choice by user
instead of value of choice.
Fix this by parsing choice-type custom field to get field value before
rendering user popover template.

Fixes #10239
This commit is contained in:
Yashashvi Dave 2018-08-09 00:59:52 +05:30 committed by Tim Abbott
parent 4aedc055ce
commit f8d4578be1
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
static/js/popovers.js
View File

@ -182,14 +182,17 @@ function show_user_profile(element, user) {
page_params.custom_profile_fields.forEach(function (field) { page_params.custom_profile_fields.forEach(function (field) {
var field_value = people.get_custom_profile_data(user.user_id, field.id); var field_value = people.get_custom_profile_data(user.user_id, field.id);
var field_type = settings_profile_fields.field_type_id_to_string(field.type); var field_type = settings_profile_fields.field_type_id_to_string(field.type);
if (field_type === "Date") { if (field_value) {
profile_data[field.name] = moment(field_value).format(localFormat); if (field_type === "Date") {
} else if (field_type === "User") { profile_data[field.name] = moment(field_value).format(localFormat);
if (field_value) { } else if (field_type === "User") {
profile_data[field.name] = people.safe_full_names([field_value]); profile_data[field.name] = people.safe_full_names([field_value]);
} else if (field_type === "Choice") {
var field_choice_dict = JSON.parse(field.field_data);
profile_data[field.name] = field_choice_dict[field_value].text;
} else {
profile_data[field.name] = field_value;
} }
} else {
profile_data[field.name] = field_value;
} }
}); });