tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

2014-05-22 Vanessa Gil <vanessa.gil@artica.es>

Browse Source 
* godmode/setup/setup_visuals.php
	  include/functions_config.php
	  operation/agentes/estado_monitores.php: Added optional
	module pagination.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9983 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2014-05-22 08:34:40 +00:00
parent a326f8f5e1
commit 9af35a531f
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,10 +1,17 @@
2014-05-22 Vanessa Gil <vanessa.gil@artica.es>
* godmode/setup/setup_visuals.php
include/functions_config.php
operation/agentes/estado_monitores.php: Added optional
module pagination.
2014-05-21 Sergio Martin <sergio.martin@artica.es> 2014-05-21 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Fix unknown graphs in graphs * include/functions_graph.php: Fix unknown graphs in graphs
with only negative values. Now the unknown graph is always positive with only negative values. Now the unknown graph is always positive
Ticket: #569 Ticket: #569
2014-05-22 Vanessa Gil <vanessa.gil@artica.es> 2014-05-21 Vanessa Gil <vanessa.gil@artica.es>
* godmode/servers/manage_recontask.php * godmode/servers/manage_recontask.php
operation/servers/recon_view.php: Added tabs. operation/servers/recon_view.php: Added tabs.

5
pandora_console/godmode/setup/setup_visuals.php
View File

@ -368,6 +368,11 @@ $table->data[$row][1] = html_print_textarea('custom_report_front_footer', 5, 15,
$row++; $row++;
$table->data[$row][0] = __('Paginate module view');
$table->data[$row][1] = html_print_checkbox('paginate_module', 1, $config['paginate_module'], true);
$row++;
echo '<form id="form_setup" method="post">'; echo '<form id="form_setup" method="post">';
html_print_input_hidden ('update_config', 1); html_print_input_hidden ('update_config', 1);
html_print_table ($table); html_print_table ($table);

2
pandora_console/include/functions_config.php
View File

@ -426,6 +426,8 @@ function config_update_config () {
$error_update[] = __('Default icon in GIS'); $error_update[] = __('Default icon in GIS');
if (!config_update_value ('autohidden_menu', get_parameter('autohidden_menu'))) if (!config_update_value ('autohidden_menu', get_parameter('autohidden_menu')))
$error_update[] = __('Autohidden menu'); $error_update[] = __('Autohidden menu');
if (!config_update_value ('paginate_module', get_parameter('paginate_module')))
$error_update[] = __('Paginate module');
$interval_values = get_parameter ('interval_values'); $interval_values = get_parameter ('interval_values');

17
pandora_console/operation/agentes/estado_monitores.php
View File

@ -317,8 +317,11 @@ if ($monitors_change_filter) {
else { else {
$limit = " LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0); $limit = " LIMIT " . $config['block_size'] . " OFFSET " . get_parameter ('offset',0);
} }
if ($config['paginate_module']) {
$modules = db_get_all_rows_sql ($sql . $limit); $modules = db_get_all_rows_sql ($sql . $limit);
} else {
$modules = db_get_all_rows_sql ($sql);
}
if (empty ($modules)) { if (empty ($modules)) {
$modules = array (); $modules = array ();
} }
@ -680,9 +683,15 @@ else {
"status_filter_monitor=" . $status_filter_monitor . "&" . "status_filter_monitor=" . $status_filter_monitor . "&" .
"status_text_monitor=" . $status_text_monitor; "status_text_monitor=" . $status_text_monitor;
ui_pagination ($count_modules, $url); if ($config['paginate_module']) {
ui_pagination ($count_modules, $url);
}
html_print_table ($table); html_print_table ($table);
ui_pagination ($count_modules, $url);
if ($config['paginate_module']) {
ui_pagination ($count_modules, $url);
}
} }
unset ($table); unset ($table);