paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings_org: Use the actual value for private message policy options value.

Browse Source 
This change is in series of de-duplication of code in "Other permission"
section for various dropdowns.

Here rather than using "by_anyone" and "disabled" for the `value` attribute
of options, we use actual numeric values. As a result, we don't need to
manually handle to extract the data to be sent to the backend on saving.
This commit is contained in:
Pragati Agrawal
2020-01-28 12:21:44 +05:30
parent 97e24e6e8a
commit 91a32fecbe
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
static/js/settings_org.js
View File

@@ -85,6 +85,19 @@ exports.user_group_edit_policy_values = {
},
};
exports.private_message_policy_values = {
by_anyone: {
order: 1,
code: 1,
description: i18n.t("Admins, members, and guests"),
},
disabled: {
order: 2,
code: 2,
description: i18n.t("Private messages disabled"),
},
};
exports.get_sorted_options_list = function (option_values_object) {
const options_list = Object.keys(option_values_object).map((key) => {
return _.extend(option_values_object[key], {key: key});
@@ -115,6 +128,8 @@ exports.get_organization_settings_options = () => {
exports.invite_to_stream_policy_values);
options.user_group_edit_policy_values = exports.get_sorted_options_list(
exports.user_group_edit_policy_values);
options.private_message_policy_values = exports.get_sorted_options_list(
exports.private_message_policy_values);
return options;
};
@@ -159,15 +174,6 @@ function get_property_value(property_name) {
return "custom_days";
}
if (property_name === 'realm_private_message_policy') {
if (page_params.realm_private_message_policy === 1) {
return "by_anyone";
}
if (page_params.realm_private_message_policy === 2) {
return "disabled";
}
}
if (property_name === 'realm_add_emoji_by_admins_only') {
if (page_params.realm_add_emoji_by_admins_only) {
return "by_admins_only";
@@ -851,7 +857,6 @@ exports.build_page = function () {
JSON.stringify(parseInt(new_message_retention_days, 10)) : null;
} else if (subsection === 'other_permissions') {
const waiting_period_threshold = $("#id_realm_waiting_period_setting").val();
const private_message_policy = $("#id_realm_private_message_policy").val();
const add_emoji_permission = $("#id_realm_add_emoji_by_admins_only").val();
if (add_emoji_permission === "by_admins_only") {
@@ -860,12 +865,6 @@ exports.build_page = function () {
data.add_emoji_by_admins_only = false;
}
if (private_message_policy === "disabled") {
data.private_message_policy = 2;
} else if (private_message_policy === "by_anyone") {
data.private_message_policy = 1;
}
if (waiting_period_threshold === "none") {
data.waiting_period_threshold = 0;
} else if (waiting_period_threshold === "three_days") {

3
static/templates/settings/organization_permissions_admin.hbs
View File

@@ -130,8 +130,7 @@
</a>
</label>
<select name="realm_private_message_policy" class="setting-widget prop-element" id="id_realm_private_message_policy" data-setting-widget-type="integer">
<option value="by_anyone">{{t "Admins, members, and guests" }}</option>
<option value="disabled">{{t "Private messages disabled" }}</option>
{{> dropdown_options_widget option_values=private_message_policy_values}}
</select>
</div>