paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 19:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

zerver/lib/events.py: Add FIELD_TYPE_CHOICES_DICT to page_params.

Browse Source 
This commit add FIELD_TYPE_CHOICES_DICT to page_params and replace
FIELD_TYPE_CHOICES.

FIELD_TYPE_CHOICES_DICT includes all field types with keyword, id
and display name. Using this field-type-dict, we can access field
type information by it's keyword, and remove all static use of
field-type'a name or id in frontend.
This commit also modifies functions in js where this page_params
field-types is used.
This commit is contained in:
Yashashvi Dave
2018-08-15 15:05:18 +05:30
committed by Tim Abbott
parent 621a5cdc35
commit 6e65235a6d
6 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
static/js/settings_profile_fields.js
View File

@@ -9,10 +9,17 @@ var meta = {
var order = [];
exports.field_type_id_to_string = function (type_id) {
var name = _.find(page_params.custom_profile_field_types, function (type) {
return type[0] === type_id;
})[1];
return name;
var field_types = page_params.custom_profile_field_types;
var field_type_str;
_.every(field_types, function (field_type) {
if (field_type.id === type_id) {
field_type_str = field_type.name;
return false;
}
return true;
});
return field_type_str;
};
function delete_profile_field(e) {
@@ -156,7 +163,7 @@ function open_edit_form(e) {
profile_field.form.find('input[name=name]').val(field.name);
profile_field.form.find('input[name=hint]').val(field.hint);
if (exports.field_type_id_to_string(field.type) === "Choice") {
if (parseInt(field.type, 10) === page_params.custom_profile_field_types.CHOICE.id) {
// Re-render field choices in edit form to load initial choice data
var choice_list = profile_field.form.find('.edit_profile_field_choices_container');
choice_list.off();