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

org_settings: Fix data collection of message retention property.

Browse Source 
In handlebars and settings_org.js, the subsection in which
`realm_message_retention_days` property lies doesn't agree, and this wasn't
observed for a long time as it's disabled, still to make things right, in
this commit we have moved the logic which handles the collection of data
from `other_permission` to `other_settings` as it makes more sense there.
This commit is contained in:
Pragati Agrawal
2019-03-25 18:18:07 +05:30
committed by Tim Abbott
parent ed30f71e07
commit 3dd5e1642b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/settings_org.js
View File

@@ -234,7 +234,6 @@ function test_submit_settings_form(submit_form) {
}; };
$("#id_realm_create_stream_permission").val("by_anyone"); $("#id_realm_create_stream_permission").val("by_anyone");
$("#id_realm_add_emoji_by_admins_only").val("by_anyone"); $("#id_realm_add_emoji_by_admins_only").val("by_anyone");
$("#id_realm_message_retention_days").val("15");
const bot_creation_policy_elem = $("#id_realm_bot_creation_policy"); const bot_creation_policy_elem = $("#id_realm_bot_creation_policy");
bot_creation_policy_elem.val("1"); bot_creation_policy_elem.val("1");
bot_creation_policy_elem.attr('id', 'id_realm_bot_creation_policy'); bot_creation_policy_elem.attr('id', 'id_realm_bot_creation_policy');
@@ -261,7 +260,6 @@ function test_submit_settings_form(submit_form) {
let expected_value = { let expected_value = {
bot_creation_policy: '1', bot_creation_policy: '1',
email_address_visibility: '1', email_address_visibility: '1',
message_retention_days: '15',
add_emoji_by_admins_only: false, add_emoji_by_admins_only: false,
create_stream_by_admins_only: false, create_stream_by_admins_only: false,
waiting_period_threshold: 0, waiting_period_threshold: 0,

7
static/js/settings_org.js
View File

@@ -668,9 +668,7 @@ exports.build_page = function () {
data.message_content_delete_limit_seconds = data.message_content_delete_limit_seconds =
exports.msg_delete_limit_dropdown_values[delete_limit_setting_value].seconds; exports.msg_delete_limit_dropdown_values[delete_limit_setting_value].seconds;
} }
} else if (subsection === 'other_permissions') { } else if (subsection == 'other_settings') {
var create_stream_permission = $("#id_realm_create_stream_permission").val();
var add_emoji_permission = $("#id_realm_add_emoji_by_admins_only").val();
var new_message_retention_days = $("#id_realm_message_retention_days").val(); var new_message_retention_days = $("#id_realm_message_retention_days").val();
if (parseInt(new_message_retention_days, 10).toString() !== new_message_retention_days if (parseInt(new_message_retention_days, 10).toString() !== new_message_retention_days
@@ -680,6 +678,9 @@ exports.build_page = function () {
data.message_retention_days = new_message_retention_days !== "" ? data.message_retention_days = new_message_retention_days !== "" ?
JSON.stringify(parseInt(new_message_retention_days, 10)) : null; JSON.stringify(parseInt(new_message_retention_days, 10)) : null;
} else if (subsection === 'other_permissions') {
var create_stream_permission = $("#id_realm_create_stream_permission").val();
var add_emoji_permission = $("#id_realm_add_emoji_by_admins_only").val();
if (add_emoji_permission === "by_admins_only") { if (add_emoji_permission === "by_admins_only") {
data.add_emoji_by_admins_only = true; data.add_emoji_by_admins_only = true;