diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js index 283acf8005..da969814cc 100644 --- a/pandora_console/include/javascript/pandora_dashboards.js +++ b/pandora_console/include/javascript/pandora_dashboards.js @@ -22,6 +22,9 @@ function show_option_dialog(settings) { method: "updateDashboard", dataType: "json" }, + oncancel: { + reload: true + }, ajax_callback: update_dashboard }); } @@ -458,6 +461,10 @@ function initialiceLayout(data) { }*/ function configurationWidget(cellId, widgetId, size) { + var reload = 0; + if (widgetId == 46) { + reload = 1; + } load_modal({ target: $("#modal-config-widget"), form: "form-config-widget", @@ -483,8 +490,12 @@ function initialiceLayout(data) { method: "saveWidgetIntoCell", dataType: "json" }, + oncancel: { + reload: reload + }, ajax_callback: update_widget_to_cell, - onsubmitClose: 1 + onsubmitClose: 1, + onsubmitReload: reload }); } diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js index 45ca47e92b..de17eae3ea 100644 --- a/pandora_console/include/javascript/pandora_ui.js +++ b/pandora_console/include/javascript/pandora_ui.js @@ -168,6 +168,8 @@ function load_modal(settings) { if (typeof settings.oncancel.confirm == "function") { //receive function settings.oncancel.confirm(cancelModal); + } else if (settings.oncancel.reload == true) { + location.reload(); } else if (settings.oncancel != undefined) { cancelModal(); } @@ -347,6 +349,13 @@ function load_modal(settings) { AJAX_RUNNING = 0; } }); + + if ( + settings.onsubmitReload != undefined && + settings.onsubmitReload == true + ) { + location.reload(); + } } else { AJAX_RUNNING = 0; } diff --git a/pandora_console/include/lib/Dashboard/Widgets/security_hardening.php b/pandora_console/include/lib/Dashboard/Widgets/security_hardening.php index b3c124f039..0e9612cd29 100644 --- a/pandora_console/include/lib/Dashboard/Widgets/security_hardening.php +++ b/pandora_console/include/lib/Dashboard/Widgets/security_hardening.php @@ -274,9 +274,9 @@ class SecurityHardening extends Widget 'name' => 'range', 'type' => 'date_range', 'selected' => 'chose_range', - 'date_init' => date('Y-m-d', $values['date_init']), + 'date_init' => date('Y/m/d', $values['date_init']), 'time_init' => date('H:i:s', $values['date_init']), - 'date_end' => date('Y-m-d', $values['date_end']), + 'date_end' => date('Y/m/d', $values['date_end']), 'time_end' => date('H:i:s', $values['date_end']), 'return' => true, ], diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 8f8226320e..2e6cd36149 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -12048,6 +12048,10 @@ div.relative > div > div#ui-datepicker-div { left: 5px !important; } +#ui-datepicker-div .ui-datepicker-header { + background-color: white; +} + .ui-widget-overlay { background: #aaa; opacity: 0.3 !important;