github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v5.5.0.0

Browse Source 
Changelog: https://roxy-wi.org/changelog.py#5_5_0
pull/321/head
Pavel Loginov 3 years ago
parent 6a8c0644f9
commit 7a1ef52c40
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File

3
app/templates/base.html
Unescape View File

@ -265,8 +265,7 @@
<td> <td>
<select id="disable_alerting"> <select id="disable_alerting">
<option value="0" title="Alerts for all tabs are enabled">All alerts are enabled</option> <option value="0" title="Alerts for all tabs are enabled">All alerts are enabled</option>
<option value="1">Disable alerting for the current</option> <option value="1">Disable alerting</option>
<option value="2">Disable alerting for all tabs</option>
</select> </select>
</td> </td>
</tr> </tr>

10
inc/script.js
Unescape View File

@ -932,12 +932,9 @@ $( function() {
}); });
$('#show-user-settings-button').click(function() { $('#show-user-settings-button').click(function() {
if (sessionStorage.getItem('disabled_alert') == '1') { if (localStorage.getItem('disabled_alert') == '1') {
$('#disable_alerting option[value="1"]').prop('selected', true); $('#disable_alerting option[value="1"]').prop('selected', true);
$('#disable_alerting').selectmenu('refresh'); $('#disable_alerting').selectmenu('refresh');
} else if (localStorage.getItem('disabled_alert') == '1') {
$('#disable_alerting option[value="2"]').prop('selected', true);
$('#disable_alerting').selectmenu('refresh');
} else { } else {
$('#disable_alerting option[value="0"]').prop('selected', true); $('#disable_alerting option[value="0"]').prop('selected', true);
$('#disable_alerting').selectmenu('refresh'); $('#disable_alerting').selectmenu('refresh');
@ -1111,9 +1108,6 @@ function saveUserSettings(){
} else if ($('#disable_alerting').val() == '1') { } else if ($('#disable_alerting').val() == '1') {
sessionStorage.setItem('disabled_alert', '1'); sessionStorage.setItem('disabled_alert', '1');
localStorage.removeItem('disabled_alert'); localStorage.removeItem('disabled_alert');
} else if ($('#disable_alerting').val() == '2') {
localStorage.setItem('disabled_alert', '1');
sessionStorage.removeItem('disabled_alert');
} }
changeCurrentGroupF(); changeCurrentGroupF();
} }
@ -1269,7 +1263,7 @@ function getAlerts() {
socket.onmessage = function(event) { socket.onmessage = function(event) {
cur_url = window.location.href.split('/').pop(); cur_url = window.location.href.split('/').pop();
cur_url = cur_url.split('?'); cur_url = cur_url.split('?');
if (cur_url[0] != 'login.py' && sessionStorage.getItem('disabled_alert') === null && localStorage.getItem('disabled_alert') === null) { if (cur_url[0] != 'login.py' && localStorage.getItem('disabled_alert') === null) {
data = event.data.split(";"); data = event.data.split(";");
for (i = 0; i < data.length; i++) { for (i = 0; i < data.length; i++) {
if (data[i].indexOf('error:') != '-1' || data[i].indexOf('alert') != '-1' || data[i].indexOf('FAILED') != '-1') { if (data[i].indexOf('error:') != '-1' || data[i].indexOf('alert') != '-1' || data[i].indexOf('FAILED') != '-1') {

Write Preview
Loading…
Cancel
Save