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

org settings: Refactor the render_notifications_stream_ui function.

Browse Source 
We are having a same code in `render_notifications_stream_ui`
and `render_signup_notifications_stream_ui` functions aside from
the HTML element. So this commit will remove the duplicate code in
`render_signup_notifications_stream_ui` and make use of
`render_notifications_stream_ui`.

Fixes #8886.
This commit is contained in:
Balaji2198
2018-03-31 07:14:07 +05:30
committed by Tim Abbott
parent 21fe9fe20a
commit 724117cd45
3 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/settings_org.js
View File

@@ -502,12 +502,12 @@ function test_extract_property_name() {
assert.equal(stream_id, 75);
return { name: 'some_stream' };
};
settings_org.render_signup_notifications_stream_ui(75);
settings_org.render_notifications_stream_ui(75, elem);
assert.equal(elem.text(), '#some_stream');
assert(!elem.hasClass('text-warning'));
stream_data.get_sub_by_id = noop;
settings_org.render_signup_notifications_stream_ui();
settings_org.render_notifications_stream_ui(undefined, elem);
assert.equal(elem.text(), 'translated: Disabled');
assert(elem.hasClass('text-warning'));

10
static/js/server_events_dispatch.js
View File

@@ -91,8 +91,9 @@ exports.dispatch_normal_event = function dispatch_normal_event(event) {
page_params.realm_notifications_stream_id,
$('#realm_notifications_stream_name'));
} else if (event.property === 'signup_notifications_stream_id') {
settings_org.render_signup_notifications_stream_ui(
page_params.realm_signup_notifications_stream_id);
settings_org.render_notifications_stream_ui(
page_params.realm_signup_notifications_stream_id,
$('#realm_signup_notifications_stream_name'));
}
if (event.property === 'name' && window.electron_bridge !== undefined) {
@@ -234,8 +235,9 @@ exports.dispatch_normal_event = function dispatch_normal_event(event) {
}
if (page_params.realm_signup_notifications_stream_id === stream.stream_id) {
page_params.realm_signup_notifications_stream_id = -1;
settings_org.render_signup_notifications_stream_ui(
page_params.realm_signup_notifications_stream_id);
settings_org.render_notifications_stream_ui(
page_params.realm_signup_notifications_stream_id,
$('#realm_signup_notifications_stream_name'));
}
});
}

22
static/js/settings_org.js
View File

@@ -272,22 +272,6 @@ exports.populate_notifications_stream_dropdown = function (stream_list) {
});
};
exports.render_signup_notifications_stream_ui = function (stream_id) {
var elem = $('#realm_signup_notifications_stream_name');
var name = stream_data.maybe_get_stream_name(stream_id);
if (!name) {
elem.text(i18n.t("Disabled"));
elem.addClass("text-warning");
return;
}
// Happy path
elem.text('#' + name);
elem.removeClass('text-warning');
};
exports.populate_signup_notifications_stream_dropdown = function (stream_list) {
var dropdown_list_body = $("#id_realm_signup_notifications_stream .dropdown-list-body").expectOne();
var search_input = $("#id_realm_signup_notifications_stream .dropdown-search > input[type=text]");
@@ -379,7 +363,8 @@ function _set_up() {
}
exports.render_notifications_stream_ui(page_params.realm_notifications_stream_id,
$('#realm_notifications_stream_name'));
exports.render_signup_notifications_stream_ui(page_params.realm_signup_notifications_stream_id);
exports.render_notifications_stream_ui(page_params.realm_signup_notifications_stream_id,
$('#realm_signup_notifications_stream_name'));
// Populate realm domains
exports.populate_realm_domains(page_params.realm_domains);
@@ -777,7 +762,8 @@ function _set_up() {
var signup_notifications_stream_status = $("#admin-realm-signup-notifications-stream-status").expectOne();
function update_signup_notifications_stream(new_signup_notifications_stream_id) {
exports.render_signup_notifications_stream_ui(new_signup_notifications_stream_id);
exports.render_notifications_stream_ui(new_signup_notifications_stream_id,
$('#realm_signup_notifications_stream_name'));
signup_notifications_stream_status.hide();
var stringified_id = JSON.stringify(parseInt(new_signup_notifications_stream_id, 10));
var url = "/json/realm";