fixed merge conflict
This commit is contained in:
parent
0ab343e672
commit
5162864b28
|
@ -1910,17 +1910,14 @@ if ($not_condition !== '') {
|
|||
}
|
||||
|
||||
$data[11] = ui_print_timestamp($row['utimestamp'], true, $option);
|
||||
array_push($table->data, $data);
|
||||
}
|
||||
|
||||
array_push($table->data, $data);
|
||||
}
|
||||
|
||||
html_print_table($table);
|
||||
|
||||
if ($count_modules > $config['block_size']) {
|
||||
ui_pagination($count_modules, false, $offset, 0, false, 'offset', true, 'pagination-bottom');
|
||||
}
|
||||
|
||||
} else {
|
||||
if ($first_interaction) {
|
||||
ui_print_info_message(['no_close' => true, 'message' => __('This group doesn\'t have any monitor')]);
|
||||
|
|
Loading…
Reference in New Issue