#11807 fixed export csv in hardening, fixed interval time in exports report and fixed modal error in reports
This commit is contained in:
parent
977a18b829
commit
2844dfd4f0
|
@ -5174,6 +5174,10 @@ echo "<div id='message_no_group' title='".__('Item Editor Information')."' clas
|
|||
echo "<p class='center bolder'>".__('Please select a group.').'</p>';
|
||||
echo '</div>';
|
||||
|
||||
echo "<div id='message_no_max_item' title='".__('Max items')."' class='invisible'>";
|
||||
echo "<p class='center bolder'>".__('Please insert max item number.').'</p>';
|
||||
echo '</div>';
|
||||
|
||||
ui_require_javascript_file(
|
||||
'pandora_inventory',
|
||||
ENTERPRISE_DIR.'/include/javascript/'
|
||||
|
@ -5507,7 +5511,7 @@ $(document).ready (function () {
|
|||
return false;
|
||||
}
|
||||
break;
|
||||
case 'permissions_report':
|
||||
case 'permissions_report':
|
||||
if ($("#checkbox-select_by_group").prop("checked") && $("select#users_groups>option:selected").val() == undefined) {
|
||||
dialog_message('#message_no_group');
|
||||
return false;
|
||||
|
@ -5517,6 +5521,30 @@ $(document).ready (function () {
|
|||
return false;
|
||||
}
|
||||
break;
|
||||
case 'list_checks':
|
||||
if ($("#text-text_agent").val() == '') {
|
||||
dialog_message('#message_no_agent');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'top_n_agents_sh':
|
||||
if ($("#text-max_items").val() == '') {
|
||||
dialog_message('#message_no_max_item');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'top_n_checks_failed':
|
||||
if ($("#text-max_items").val() == '') {
|
||||
dialog_message('#message_no_max_item');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'top_n_categories_checks':
|
||||
if ($("#text-max_items").val() == '') {
|
||||
dialog_message('#message_no_max_item');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -5587,13 +5615,14 @@ $(document).ready (function () {
|
|||
|
||||
});
|
||||
|
||||
$("#submit-edit_item").click(function () {
|
||||
$("#button-edit_item").click(function () {
|
||||
var type = $('#type').val();
|
||||
|
||||
if($('#text-name').val() == ''){
|
||||
dialog_message('#message_no_name');
|
||||
return false;
|
||||
}
|
||||
|
||||
switch (type){
|
||||
case 'agent_module':
|
||||
case 'agent_module_status':
|
||||
|
@ -5646,6 +5675,30 @@ $(document).ready (function () {
|
|||
return false;
|
||||
}
|
||||
break;
|
||||
case 'list_checks':
|
||||
if ($("#text-text_agent").val() == '') {
|
||||
dialog_message('#message_no_agent');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'top_n_agents_sh':
|
||||
if ($("#text-max_items").val() == '') {
|
||||
dialog_message('#message_no_max_item');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'top_n_checks_failed':
|
||||
if ($("#text-max_items").val() == '') {
|
||||
dialog_message('#message_no_max_item');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
case 'top_n_categories_checks':
|
||||
if ($("#text-max_items").val() == '') {
|
||||
dialog_message('#message_no_max_item');
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
|
|
|
@ -547,9 +547,9 @@ function reporting_html_scoring($table, $item, $pdf=0)
|
|||
$table1->class = 'info_table';
|
||||
$table1->titleclass = 'title_table_pdf';
|
||||
$table1->rowclass[0] = '';
|
||||
$table1->head[0] = '<b>'.__('Id').'</b>';
|
||||
$table1->head[1] = '<b>'.__('Category').'</b>';
|
||||
$table1->head[2] = '<b>'.__('Total Failed').'</b>';
|
||||
$table1->head[0] = '<b>'.__('Date').'</b>';
|
||||
$table1->head[1] = '<b>'.__('Agent').'</b>';
|
||||
$table1->head[2] = '<b>'.__('Score').'</b>';
|
||||
|
||||
$row = 1;
|
||||
foreach ($item['data'] as $key => $check) {
|
||||
|
|
|
@ -97,29 +97,12 @@ $filename = (string) get_parameter('filename');
|
|||
|
||||
$date_mode = get_parameter('date_mode', 'none');
|
||||
|
||||
$period = null;
|
||||
switch ($date_mode) {
|
||||
case 'none':
|
||||
case 'end_time':
|
||||
// Get different date to search the report.
|
||||
$date = (string) get_parameter('date', date('Y-m-j'));
|
||||
$time = (string) get_parameter('time', date('h:iA'));
|
||||
break;
|
||||
|
||||
case 'init_and_end_time':
|
||||
// Get different date to search the report.
|
||||
$date = (string) get_parameter('date', date('Y-m-j'));
|
||||
$time = (string) get_parameter('time', date('h:iA'));
|
||||
|
||||
// Calculations in order to modify init date of the report
|
||||
$date_init_less = (strtotime(date('Y-m-j')) - SECONDS_1DAY);
|
||||
|
||||
$date_init = get_parameter('date_init', date('Y-m-j', $date_init_less));
|
||||
$time_init = get_parameter('time_init', date('h:iA'));
|
||||
$datetime_init = strtotime($date_init.' '.$time_init);
|
||||
|
||||
$period = (strtotime($date.' '.$time) - $datetime_init);
|
||||
break;
|
||||
$date_init = get_parameter('date_init', '');
|
||||
if (empty($date_init) === false) {
|
||||
$date_end = get_parameter('date_end', time());
|
||||
$period = ($date_end - $date_init);
|
||||
$date = date('Y-m-d', $date_end);
|
||||
$time = date('H:i:s', $date_end);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue