From 38e5bfc682bd986fbaa521ee9ed486cebb35a0bc Mon Sep 17 00:00:00 2001 From: vgilc Date: Wed, 20 Jun 2012 14:54:37 +0000 Subject: [PATCH] 2012-06-20 Vanessa Gil * pandoradb_data.sql pandoradb.data.oracle.sql pandoradb.data.postgreSQL.sql extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql godmode/setup/setup_visuals.php: Fixed bug: Inside Visual styles menu there is an option "Timestamp or time comparation" which has not a selected value by default. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6624 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 12 ++++++++++++ .../extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql | 6 ++++++ .../extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql | 5 +++++ .../pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql | 6 ++++++ pandora_console/godmode/setup/setup_visuals.php | 12 ++++++++++-- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_console/pandoradb.data.postgreSQL.sql | 2 +- pandora_console/pandoradb_data.sql | 2 +- 8 files changed, 42 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index c245801138..8432141250 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2012-06-20 Vanessa Gil + + * pandoradb_data.sql + pandoradb.data.oracle.sql + pandoradb.data.postgreSQL.sql + extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql + extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql + extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql + godmode/setup/setup_visuals.php: Fixed bug: Inside Visual styles menu + there is an option "Timestamp or time comparation" which has not a selected + value by default. + 2012-06-20 Juan Manuel Ramon * include/graphs/pChart/pPie.class.php: ixed a bug in pie3d graph diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql index f6c3ffb696..777526f44d 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql @@ -260,3 +260,9 @@ CREATE TABLE IF NOT EXISTS `tpassword_history` ( `date_end` DATETIME NOT NULL DEFAULT 0, PRIMARY KEY (`id_pass`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ----------------------------------------------------- +-- Table `tconfig` +-- ----------------------------------------------------- +UPDATE tconfig SET `value`='comparation' +WHERE `token`= 'prominent_time' diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql index 7888cb5781..edbbfb095f 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql @@ -264,3 +264,8 @@ CREATE TABLE IF NOT EXISTS tpassword_history ( ); CREATE SEQUENCE tpassword_history_s INCREMENT BY 1 START WITH 1; +-- ----------------------------------------------------- +-- Table `tconfig` +-- ----------------------------------------------------- +UPDATE tconfig SET value='comparation' +WHERE token='prominent_time' diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql index 4878c65d6b..721a68e913 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql @@ -251,3 +251,9 @@ CREATE TABLE IF NOT EXISTS "tpassword_history" ( "date_begin" BIGINT NOT NULL default 0, "date_end" BIGINT NOT NULL default 0, ); + +-- ----------------------------------------------------- +-- Table `tconfig` +-- ----------------------------------------------------- +UPDATE TABLE tconfig SET "value"='comparation' +WHERE "token"='prominent_time' diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index bad43aff0b..ff50460b43 100644 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -48,11 +48,19 @@ $table->data[1][0] = __('Date format string') . ui_print_help_icon("date_format" $table->data[1][1] = ''.__('Example').' '.date ($config["date_format"]); $table->data[1][1] .= html_print_input_text ('date_format', $config["date_format"], '', 30, 100, true); +if($config['prominent_time'] == 'comparation') { + $timestamp = false; + $comparation = true; +} else if ($config['prominent_time'] == 'timestamp') { + $timestamp = true; + $comparation = false; +} + $table->data[2][0] = __('Timestamp or time comparation') . ui_print_help_icon ("time_stamp-comparation", true); $table->data[2][1] = __('Comparation in rollover').' '; -$table->data[2][1] .= html_print_radio_button ('prominent_time', "comparation", '', $config["prominent_time"], true); +$table->data[2][1] .= html_print_radio_button ('prominent_time', "comparation", '', $comparation, true); $table->data[2][1] .= '
'.__('Timestamp in rollover').' '; -$table->data[2][1] .= html_print_radio_button ('prominent_time', "timestamp", '', $config["prominent_time"], true); +$table->data[2][1] .= html_print_radio_button ('prominent_time', "timestamp", '', $timestamp, true); $table->data[3][0] = __('Graph color (min)'); $table->data[3][1] = html_print_input_text ('graph_color1', $config["graph_color1"], '', 8, 8, true); diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql index 8d49964292..2b0f7cb646 100644 --- a/pandora_console/pandoradb.data.oracle.sql +++ b/pandora_console/pandoradb.data.oracle.sql @@ -68,7 +68,7 @@ INSERT INTO tconfig (token, value) VALUES ('date_format', 'F j, Y, g:i a'); INSERT INTO tconfig (token, value) VALUES ('event_view_hr', 8); INSERT INTO tconfig (token, value) VALUES ('loginhash_pwd', ' '); INSERT INTO tconfig (token, value) VALUES ('trap2agent', 0); -INSERT INTO tconfig (token, value) VALUES ('prominent_time', 0); +INSERT INTO tconfig (token, value) VALUES ('prominent_time', 'comparation'); INSERT INTO tconfig (token, value) VALUES ('timesource', 'system'); INSERT INTO tconfig (token, value) VALUES ('realtimestats', '1'); INSERT INTO tconfig (token, value) VALUES ('stats_interval', '60'); diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql index a09aba7f41..7ee6651cdd 100644 --- a/pandora_console/pandoradb.data.postgreSQL.sql +++ b/pandora_console/pandoradb.data.postgreSQL.sql @@ -64,7 +64,7 @@ INSERT INTO "tconfig" ("token", "value") VALUES ('event_view_hr', 8), ('loginhash_pwd', ''), ('trap2agent', 0), -('prominent_time', 0), +('prominent_time', 'comparation'), ('timesource', 'system'), ('realtimestats', '1'), ('stats_interval', '60'), diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 858fe156e9..a98a9d4371 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -63,7 +63,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('event_view_hr', 8), ('loginhash_pwd', ''), ('trap2agent', 0), -('prominent_time', 0), +('prominent_time', 'comparation'), ('timesource', 'system'), ('realtimestats', '1'), ('stats_interval', '60'),