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

user groups: Refactor settings_user_groups.can_edit.

Browse Source
This commit is contained in:
Shubham Dhama
2018-06-14 13:14:07 +05:30
committed by Tim Abbott
parent 281611f64c
commit 05323e776e
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
frontend_tests/node_tests/settings_user_groups.js
View File

@@ -39,19 +39,16 @@ function reset_test_setup(pill_container_stub) {
}
run_test('can_edit', () => {
var me = {
is_admin: false,
};
people.get_person_from_user_id = function (id) {
assert.equal(id, undefined);
return me;
};
user_groups.is_member_of = function (group_id, user_id) {
page_params.is_admin = true;
assert(settings_user_groups.can_edit(1));
page_params.is_admin = false;
user_groups.is_member_of = (group_id, user_id) => {
assert.equal(group_id, 1);
assert.equal(user_id, undefined);
return false;
};
settings_user_groups.can_edit(1);
assert(!settings_user_groups.can_edit(1));
});
var user_group_selector = "#user-groups #1";

8
static/js/settings_user_groups.js
View File

@@ -21,10 +21,12 @@ exports.reload = function () {
};
exports.can_edit = function (group_id) {
var me = people.get_person_from_user_id(people.my_current_user_id());
return user_groups.is_member_of(group_id, people.my_current_user_id()) || me.is_admin;
};
if (page_params.is_admin) {
return true;
}
return user_groups.is_member_of(group_id, people.my_current_user_id());
};
exports.populate_user_groups = function () {
var user_groups_section = $('#user-groups').expectOne();