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: Show "save" button only when setting is changed.

Browse Source 
With this "Save" button is only shown when there are changes in a
subsection. This means if we changed a setting and reverted it back to
original ones, then, "Save" button will get disappear. Hence, we're shown
"Save" when there are some property changes to send to the server.
This commit is contained in:
Shubham Dhama
2018-03-15 04:20:17 +05:30
committed by Tim Abbott
parent be0298314a
commit 62f646816d
4 changed files with 94 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
frontend_tests/node_tests/settings_org.js
View File

@@ -446,6 +446,28 @@ function test_change_allow_subdomains(change_allow_subdomains) {
'translated: Update successful: Subdomains no longer allowed for example.com');
}
function test_extract_property_name() {
$('#id_realm_allow_message_editing').attr('id', 'id_realm_allow_message_editing');
assert.equal(
settings_org.extract_property_name($('#id_realm_allow_message_editing')),
'realm_allow_message_editing'
);
$('#id_realm_message_content_edit_limit_minutes_label').attr(
'id', 'id_realm_message_content_edit_limit_minutes_label');
assert.equal(
settings_org.extract_property_name($('#id_realm_message_content_edit_limit_minutes_label')),
'realm_message_content_edit_limit_minutes_label'
);
$('#id-realm-allow-message-deleting').attr(
'id', 'id-realm-allow-message-deleting');
assert.equal(
settings_org.extract_property_name($('#id-realm-allow-message-deleting')),
'realm_allow_message_deleting'
);
}
(function test_set_up() {
var callbacks = {};
@@ -519,6 +541,7 @@ function test_change_allow_subdomains(change_allow_subdomains) {
test_disable_notifications_stream(callbacks.disable_notifications_stream);
test_disable_signup_notifications_stream(callbacks.disable_signup_notifications_stream);
test_change_allow_subdomains(change_allow_subdomains);
test_extract_property_name();
}());
(function test_misc() {

68
static/js/settings_org.js
View File

@@ -418,6 +418,71 @@ function _set_up() {
settings_ui.disable_sub_setting_onchange(this.checked, "id_realm_message_content_edit_limit_minutes", true);
});
function property_value_element_refers(property_name) {
if (property_name === 'realm_message_content_edit_limit_minutes') {
return Math.ceil(page_params.realm_message_content_edit_limit_seconds / 60);
}
return;
}
exports.extract_property_name = function (elem) {
return elem.attr('id').split('-').join('_').replace("id_", "");
};
function check_property_changed(elem) {
elem = $(elem);
var property_name = exports.extract_property_name(elem);
var current_val = page_params[property_name];
var changed_val;
if (typeof current_val === 'boolean') {
changed_val = elem.prop('checked');
} else if (typeof current_val === 'string') {
changed_val = elem.val().trim();
} else if (typeof current_val === 'number') {
current_val = current_val.toString();
changed_val = elem.val().trim();
} else {
// Check whether the id refers to a property whose name we can't
// extract from element's id.
current_val = property_value_element_refers(property_name);
if (current_val !== undefined) {
current_val = current_val.toString();
changed_val = elem.val().trim();
} else {
blueslip.error('Element refers to unknown property ' + property_name);
}
}
return current_val !== changed_val;
}
function get_subsection_property_elements(element) {
var subsection = $(element).closest('.org-subsection-parent');
return subsection.find("input[id^='id_realm_'], select[id^='id_realm_']");
}
$('.organization').on('change input', 'input, select', function (e) {
e.preventDefault();
e.stopPropagation();
var subsection = $(this).closest('.org-subsection-parent');
var properties_elements = get_subsection_property_elements(subsection);
var show_change_process_button = false;
_.each(properties_elements , function (elem) {
if (check_property_changed(elem)) {
show_change_process_button = true;
}
});
var change_process_button = subsection.find('.subsection-header .button');
change_process_button.first().text(i18n.t("Save"));
if (show_change_process_button) {
change_process_button.removeClass('hide').addClass('show');
} else {
change_process_button.removeClass('show').addClass('hide');
}
});
exports.save_organization_settings = function (data, save_button, success_continuation) {
var failed_alert_elem = $('#admin-realm-failed-change-status');
save_button.text(i18n.t("Saving"));
@@ -427,8 +492,9 @@ function _set_up() {
data: data,
success: function (response_data) {
failed_alert_elem.hide();
save_button.text(i18n.t("Saved"));
save_button.attr("data-status", "saved");
save_button.text(i18n.t("Saved"));
save_button.removeClass('hide').addClass('show').stop(true).fadeTo(0, 1);
if (success_continuation !== undefined) {
success_continuation(response_data);
}

2
static/styles/settings.css
View File

@@ -367,7 +367,7 @@ input[type=checkbox] + .inline-block {
display: inline;
}
.org-settings-form .subsection-header div[class*="subsection-changes"] button {
.org-settings-form .subsection-header div[class*="subsection-changes"] button.show {
display: inline-block;
margin-top: -4px;
min-width: 80px;

6
static/templates/settings/organization-settings-admin.handlebars
View File

@@ -9,7 +9,7 @@
<h3>{{t "Message editing" }}</h3>
{{#if is_admin }}
<div class="input-group organization-submission subsection-changes-save">
<button id="org-submit-msg-editing" class="button rounded sea-green" data-status="save">
<button id="org-submit-msg-editing" class="button rounded sea-green hide" data-status="save">
{{t 'Save' }}
</button>
</div>
@@ -70,7 +70,7 @@
<h3>{{t "Message feed" }}</h3>
{{#if is_admin }}
<div class="input-group organization-submission subsection-changes-save">
<button id="org-submit-msg-feed" class="button rounded sea-green" data-status="save">
<button id="org-submit-msg-feed" class="button rounded sea-green hide" data-status="save">
{{t 'Save' }}
</button>
</div>
@@ -134,7 +134,7 @@
<h3>{{t "Language &amp; notifications" }}</h3>
{{#if is_admin }}
<div class="input-group organization-submission subsection-changes-save">
<button id="org-submit-language-notify" class="button rounded sea-green" data-status="save">
<button id="org-submit-language-notify" class="button rounded sea-green hide" data-status="save">
{{t 'Save' }}
</button>
</div>