paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 15:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

user_groups: Convert members to a dict in frontend.

Browse Source
This commit is contained in:
Tim Abbott
2018-03-04 08:44:12 -08:00
parent 3a14317376
commit 0147826042
5 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/popovers.js
View File

@@ -189,7 +189,7 @@ function show_user_group_info_popover(element, group, message) {
var args = {
group_name: group.name,
group_description: group.description,
members: sort_group_members(fetch_group_members(group.members)),
members: sort_group_members(fetch_group_members(group.members.keys())),
};
elt.popover({
placement: calculate_info_popover_placement(popover_size, elt),

6
static/js/settings_user_groups.js
View File

@@ -36,7 +36,7 @@ exports.populate_user_groups = function () {
var pill_container = $('.pill-container[data-group-pills="' + data.name + '"]');
var pills = input_pill(pill_container);
data.members.forEach(function (user_id) {
data.members.keys().forEach(function (user_id) {
var user = people.get_person_from_user_id(user_id);
if (user) {
@@ -47,7 +47,7 @@ exports.populate_user_groups = function () {
});
function update_save_state(draft_group) {
var original_group = user_groups.get_user_group_from_id(data.id).members;
var original_group = user_groups.get_user_group_from_id(data.id).members.keys();
var same_groups = _.isEqual(_.sortBy(draft_group), _.sortBy(original_group));
var save_changes = pill_container.siblings('.save-member-changes');
var save_hidden = save_changes.css('display') === 'none';
@@ -110,7 +110,7 @@ exports.populate_user_groups = function () {
$('#user-groups #' + data.id).on('click', '.save-member-changes', function () {
var draft_group = pills.keys();
var group_data = user_groups.get_user_group_from_id(data.id);
var original_group = group_data.members;
var original_group = group_data.members.keys();
var added = _.difference(draft_group, original_group);
var removed = _.difference(original_group, draft_group);
var btn = $(this);

5
static/js/user_groups.js
View File

@@ -16,6 +16,9 @@ exports.init = function () {
exports.init();
exports.add = function (user_group) {
// Reformat the user group members structure to be a dict.
user_group.members = Dict.from_array(user_group.members);
user_group_name_dict.set(user_group.name, user_group);
user_group_by_id_dict.set(user_group.id, user_group);
};
@@ -43,7 +46,7 @@ exports.get_realm_user_groups = function () {
exports.is_member_of = function (user_group_id, user_id) {
var user_group = user_group_by_id_dict.get(user_group_id);
return user_group.members.indexOf(user_id) !== -1;
return user_group.members.has(user_id);
};
exports.initialize = function () {