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

settings: Change id and name of message delete limit dropdown.

Browse Source 
We change the id and name of message delete limit dropdown to
"id_realm_message_content_delete_limit_seconds" and
"realm_message_content_delete_limit_seconds" respectively.

This is a prep commit for sending only changed settings in
message editing section to the API.
This commit is contained in:
Sahil Batra
2022-08-19 20:17:26 +05:30
committed by Tim Abbott
parent 1e9c65b759
commit 17aba277c5
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend_tests/node_tests/settings_org.js
View File

@@ -463,14 +463,16 @@ function test_discard_changes_button(discard_changes) {
const $message_content_edit_limit_minutes = $( const $message_content_edit_limit_minutes = $(
"#id_realm_message_content_edit_limit_minutes", "#id_realm_message_content_edit_limit_minutes",
).val(130); ).val(130);
const $msg_delete_limit_setting = $("#id_realm_msg_delete_limit_setting").val("custom_period"); const $msg_delete_limit_setting = $("#id_realm_message_content_delete_limit_seconds").val(
"custom_period",
);
const $message_content_delete_limit_minutes = $( const $message_content_delete_limit_minutes = $(
"#id_realm_message_content_delete_limit_minutes", "#id_realm_message_content_delete_limit_minutes",
).val(130); ).val(130);
$allow_edit_history.attr("id", "id_realm_allow_edit_history"); $allow_edit_history.attr("id", "id_realm_allow_edit_history");
$msg_edit_limit_setting.attr("id", "id_realm_message_content_edit_limit_seconds"); $msg_edit_limit_setting.attr("id", "id_realm_message_content_edit_limit_seconds");
$msg_delete_limit_setting.attr("id", "id_realm_msg_delete_limit_setting"); $msg_delete_limit_setting.attr("id", "id_realm_message_content_delete_limit_seconds");
$edit_topic_policy.attr("id", "id_realm_edit_topic_policy"); $edit_topic_policy.attr("id", "id_realm_edit_topic_policy");
$message_content_edit_limit_minutes.attr("id", "id_realm_message_content_edit_limit_minutes"); $message_content_edit_limit_minutes.attr("id", "id_realm_message_content_edit_limit_minutes");
$message_content_delete_limit_minutes.attr( $message_content_delete_limit_minutes.attr(

18
static/js/settings_org.js
View File

@@ -190,7 +190,7 @@ function get_property_value(property_name, for_realm_default_settings) {
return "retain_for_period"; return "retain_for_period";
} }
if (property_name === "realm_msg_delete_limit_setting") { if (property_name === "realm_message_content_delete_limit_seconds") {
if (page_params.realm_message_content_delete_limit_seconds === null) { if (page_params.realm_message_content_delete_limit_seconds === null) {
return "any_time"; return "any_time";
} }
@@ -342,10 +342,10 @@ function set_delete_own_message_policy_dropdown(setting_value) {
$("#id_realm_delete_own_message_policy").val(setting_value); $("#id_realm_delete_own_message_policy").val(setting_value);
settings_ui.disable_sub_setting_onchange( settings_ui.disable_sub_setting_onchange(
message_delete_limit_setting_enabled(setting_value), message_delete_limit_setting_enabled(setting_value),
"id_realm_msg_delete_limit_setting", "id_realm_message_content_delete_limit_seconds",
true, true,
); );
const limit_value = get_property_value("realm_msg_delete_limit_setting"); const limit_value = get_property_value("realm_message_content_delete_limit_seconds");
if (limit_value === "custom_period") { if (limit_value === "custom_period") {
settings_ui.disable_sub_setting_onchange( settings_ui.disable_sub_setting_onchange(
message_delete_limit_setting_enabled(setting_value), message_delete_limit_setting_enabled(setting_value),
@@ -356,8 +356,8 @@ function set_delete_own_message_policy_dropdown(setting_value) {
} }
function set_msg_delete_limit_dropdown() { function set_msg_delete_limit_dropdown() {
const value = get_property_value("realm_msg_delete_limit_setting"); const value = get_property_value("realm_message_content_delete_limit_seconds");
$("#id_realm_msg_delete_limit_setting").val(value); $("#id_realm_message_content_delete_limit_seconds").val(value);
change_element_block_display_property( change_element_block_display_property(
"id_realm_message_content_delete_limit_minutes", "id_realm_message_content_delete_limit_minutes",
value === "custom_period", value === "custom_period",
@@ -484,7 +484,7 @@ function update_dependent_subsettings(property_name) {
case "realm_message_retention_days": case "realm_message_retention_days":
set_message_retention_setting_dropdown(); set_message_retention_setting_dropdown();
break; break;
case "realm_msg_delete_limit_setting": case "realm_message_content_delete_limit_seconds":
case "realm_message_content_delete_limit_minutes": case "realm_message_content_delete_limit_minutes":
set_msg_delete_limit_dropdown(); set_msg_delete_limit_dropdown();
break; break;
@@ -993,7 +993,9 @@ export function register_save_discard_widget_handlers(
).seconds; ).seconds;
} }
} }
const delete_limit_setting_value = $("#id_realm_msg_delete_limit_setting").val(); const delete_limit_setting_value = $(
"#id_realm_message_content_delete_limit_seconds",
).val();
switch (delete_limit_setting_value) { switch (delete_limit_setting_value) {
case "any_time": { case "any_time": {
data.message_content_delete_limit_seconds = JSON.stringify("unlimited"); data.message_content_delete_limit_seconds = JSON.stringify("unlimited");
@@ -1219,7 +1221,7 @@ export function build_page() {
} }
}); });
$("#id_realm_msg_delete_limit_setting").on("change", (e) => { $("#id_realm_message_content_delete_limit_seconds").on("change", (e) => {
const msg_delete_limit_dropdown_value = e.target.value; const msg_delete_limit_dropdown_value = e.target.value;
const show_custom_limit_input = msg_delete_limit_dropdown_value === "custom_period"; const show_custom_limit_input = msg_delete_limit_dropdown_value === "custom_period";
change_element_block_display_property( change_element_block_display_property(

2
static/styles/settings.css
View File

@@ -1496,7 +1496,7 @@ $option_title_width: 180px;
#id_realm_edit_topic_policy, #id_realm_edit_topic_policy,
#id_realm_message_content_edit_limit_seconds, #id_realm_message_content_edit_limit_seconds,
#id_realm_delete_own_message_policy, #id_realm_delete_own_message_policy,
#id_realm_msg_delete_limit_setting { #id_realm_message_content_delete_limit_seconds {
width: 325px; width: 325px;
} }

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

@@ -198,12 +198,12 @@
</div> </div>
<div class="input-group time-limit-setting"> <div class="input-group time-limit-setting">
<label for="realm_msg_delete_limit_setting" class="dropdown-title"> <label for="realm_message_content_delete_limit_seconds" class="dropdown-title">
{{t "Time limit for deleting messages" }} {{t "Time limit for deleting messages" }}
<i class="fa fa-info-circle settings-info-icon tippy-zulip-tooltip" <i class="fa fa-info-circle settings-info-icon tippy-zulip-tooltip"
aria-hidden="true" data-tippy-content="{{t 'Administrators can delete any message.' }}"></i> aria-hidden="true" data-tippy-content="{{t 'Administrators can delete any message.' }}"></i>
</label> </label>
<select name="realm_msg_delete_limit_setting" id="id_realm_msg_delete_limit_setting" class="prop-element"> <select name="realm_message_content_delete_limit_seconds" id="id_realm_message_content_delete_limit_seconds" class="prop-element">
{{#each msg_delete_limit_dropdown_values}} {{#each msg_delete_limit_dropdown_values}}
<option value="{{0}}">{{1.text}}</option> <option value="{{0}}">{{1.text}}</option>
{{/each}} {{/each}}