netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

net/haproxy: show warning for pending configuration changes, closes #2590

Browse Source
This commit is contained in:
Frank Wall
2021-11-02 00:49:56 +01:00
parent a387c1ff86
commit 440e76aa8f
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/haproxy/pkg-descr
+1
View File
@@ -12,6 +12,7 @@ Added:
* add options "preload" and "filename scheme" to Lua scripts (#2265)
* add syslog-ng socket for logging (#2620)
* show hint to apply changes after every config change (#2590)
* show warning for pending configuration changes (#2590)
Fixed:
* unable to use the "require" function in Lua scripts (#2265)
net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
+30 -1
View File
@@ -356,6 +356,11 @@ POSSIBILITY OF SUCH DAMAGE.
message: data['status'],
draggable: true
});
} else {
// reload page to hide pending changes reminder
setTimeout(function () {
window.location.reload(true)
}, 300);
}
// when done, disable progress animation
$('[id*="reconfigureAct_progress"]').each(function(){
@@ -509,6 +514,11 @@ POSSIBILITY OF SUCH DAMAGE.
message: data['status'],
draggable: true
});
} else {
// reload page to hide pending changes reminder
setTimeout(function () {
window.location.reload(true)
}, 300);
}
// when done, disable progress animation
$('[id*="saveAndReconfigureAct_progress"]').each(function(){
@@ -522,9 +532,25 @@ POSSIBILITY OF SUCH DAMAGE.
});
});
/***********************************************************************
* UI tricks
**********************************************************************/
// show reminder when config has pending changes
function pending_changes_reminder() {
ajaxCall(url="/api/haproxy/export/diff/", sendData={}, callback=function(data,status) {
if (data['response'] && data['response'].trim()) {
$("#haproxyPendingReminder").show();
} else {
$("#haproxyPendingReminder").hide();
}
});
}
pending_changes_reminder();
// show hint after every config change
function add_apply_reminder() {
hint_msg = "{{ lang._('After changing settings, please remember to apply them with the button below') }}"
hint_msg = "{{ lang._('After changing settings, please remember to test and apply them with the buttons below.') }}"
$('[id*="haproxyChangeMessage"]').each(function(){
$(this).append(hint_msg);
});
@@ -1208,6 +1234,9 @@ POSSIBILITY OF SUCH DAMAGE.
<!-- buttons for all grid pages -->
<div class="col-md-12" id="haproxyCommonButtons" style="display: none">
<div id="haproxyPendingReminder" class="alert alert-warning" style="display: none" role="alert">
{{ lang._("There are pending configuration changes that must be applied in order for them to take effect. To review them visit the %sConfig Diff%s page.") | format('<a href="/ui/haproxy/export#diff" class="alert-link" target="_blank">', '</a>') }}
</div>
<div id="haproxyChangeMessage" class="alert alert-info" style="display: none" role="alert">
</div>
<hr/>