mirror of
https://github.com/opnsense/core.git
synced 2026-05-28 04:34:51 -04:00
system: re-fetch notification status after default apply button is done #9461
Tested with the /var/unbound/data/dnsbl_format_warning marker file it looks like the open-on-second-update is code that was never triggered and shouldn't open on fetching new status.
This commit is contained in:
parent
0f3daf70e4
commit
bab1c812bf
2 changed files with 19 additions and 21 deletions
|
|
@ -101,20 +101,19 @@ class StatusDialog {
|
|||
if (!this.clickHandlerRegistered) {
|
||||
this.clickHandlerRegistered = true;
|
||||
const translations = status.metadata.translations;
|
||||
this.dialog = new BootstrapDialog({
|
||||
title: translations.dialogTitle,
|
||||
draggable: true,
|
||||
buttons: [{
|
||||
id: 'close',
|
||||
label: translations.dialogCloseButton,
|
||||
action: (dialogRef) => {
|
||||
dialogRef.close();
|
||||
this.dialogOpen = false;
|
||||
}
|
||||
}],
|
||||
});
|
||||
$('#system_status').click(() => {
|
||||
this.dialog = new BootstrapDialog({
|
||||
title: translations.dialogTitle,
|
||||
draggable: true,
|
||||
buttons: [{
|
||||
id: 'close',
|
||||
label: translations.dialogCloseButton,
|
||||
action: (dialogRef) => {
|
||||
dialogRef.close();
|
||||
this.dialogOpen = false;
|
||||
}
|
||||
}],
|
||||
});
|
||||
|
||||
this._setDialogContent(this.currentStatus);
|
||||
|
||||
this.dialog.open();
|
||||
|
|
@ -122,11 +121,6 @@ class StatusDialog {
|
|||
});
|
||||
} else {
|
||||
this._setDialogContent(this.currentStatus);
|
||||
|
||||
if (!this.dialogOpen) {
|
||||
this.dialog.open();
|
||||
this.dialogOpen = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -252,9 +246,11 @@ class StatusBanner {
|
|||
const statusObj = new Status();
|
||||
|
||||
function updateSystemStatus() {
|
||||
statusObj.attach(new StatusIcon());
|
||||
statusObj.attach(new StatusDialog());
|
||||
statusObj.attach(new StatusBanner());
|
||||
if (statusObj.observers.length === 0) {
|
||||
statusObj.attach(new StatusIcon());
|
||||
statusObj.attach(new StatusDialog());
|
||||
statusObj.attach(new StatusBanner());
|
||||
}
|
||||
|
||||
statusObj.updateStatus();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -696,6 +696,8 @@ $.fn.SimpleActionButton = function (params) {
|
|||
if (this_button.data('grid-reload')) {
|
||||
$(this_button.data('grid-reload')).bootgrid('reload');
|
||||
}
|
||||
|
||||
updateSystemStatus();
|
||||
});
|
||||
}).fail(function () {
|
||||
setIcon(icon, 'fa fa-check fa-spinner fa-pulse', '');
|
||||
|
|
|
|||
Loading…
Reference in a new issue