IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Do not show an empty modal when an IP address is allowed or blocked. (#6265)

Browse Source
This commit is contained in:
Bianca Nenciu
2018-08-20 17:37:30 +02:00
committed by Régis Hanol
parent 860c1c3dcd
commit dc5fddbfe6
3 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/admin/components/screened-ip-address-form.js.es6
View File

@@ -59,18 +59,14 @@ export default Ember.Component.extend({
screenedIpAddress screenedIpAddress
.save() .save()
.then(result => { .then(result => {
if (result.success) { this.setProperties({ ip_address: "", formSubmitted: false });
this.setProperties({ ip_address: "", formSubmitted: false }); this.sendAction(
this.sendAction( "action",
"action", ScreenedIpAddress.create(result.screened_ip_address)
ScreenedIpAddress.create(result.screened_ip_address) );
); Ember.run.schedule("afterRender", () =>
Ember.run.schedule("afterRender", () => this.$(".ip-address-input").focus()
this.$(".ip-address-input").focus() );
);
} else {
bootbox.alert(result.errors);
}
}) })
.catch(e => { .catch(e => {
this.set("formSubmitted", false); this.set("formSubmitted", false);

13
app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
View File

@@ -46,19 +46,14 @@ export default Ember.Controller.extend({
record.set("editing", false); record.set("editing", false);
record record
.save() .save()
.then(saved => { .then(() => {
if (saved.success) { this.set("savedIpAddress", null);
this.set("savedIpAddress", null);
} else {
bootbox.alert(saved.errors);
if (wasEditing) record.set("editing", true);
}
}) })
.catch(e => { .catch(e => {
if (e.responseJSON && e.responseJSON.errors) { if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
bootbox.alert( bootbox.alert(
I18n.t("generic_error_with_reason", { I18n.t("generic_error_with_reason", {
error: e.responseJSON.errors.join(". ") error: e.jqXHR.responseJSON.errors.join(". ")
}) })
); );
} else { } else {

2
app/controllers/admin/screened_ip_addresses_controller.rb
View File

@@ -33,7 +33,7 @@ class Admin::ScreenedIpAddressesController < Admin::AdminController
def update def update
if @screened_ip_address.update_attributes(allowed_params) if @screened_ip_address.update_attributes(allowed_params)
render json: success_json render_serialized(@screened_ip_address, ScreenedIpAddressSerializer)
else else
render_json_error(@screened_ip_address) render_json_error(@screened_ip_address)
end end