From a810b0c1c051ffff93cdbf914233224a1a1511f0 Mon Sep 17 00:00:00 2001 From: Aldrioth Date: Tue, 23 Aug 2011 16:43:56 +0000 Subject: [PATCH] 2011-08-22 Tomas Palacios * pandora_console/pandoradb_data.sql pandora_console/pandoradb.data.oracle.sql pandora_console/pandoradb.postgreSQL.sql:updated the default site news. Fixes: Bug ID 3396846 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4811 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 9 +++++++++ pandora_console/pandoradb.data.oracle.sql | 4 ++-- pandora_console/pandoradb.data.postgreSQL.sql | 10 +++++++--- pandora_console/pandoradb_data.sql | 8 ++++++-- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index deda4b1536..c55c2aba50 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2011-08-22 Tomas Palacios + + * pandora_console/pandoradb_data.sql + pandora_console/pandoradb.data.oracle.sql + pandora_console/pandoradb.postgreSQL.sql:updated the + default site news. + + Fixes: Bug ID 3396846 + 2011-08-23 Sergio Martin * operation/reporting/reporting_viewer.php: Fixed require embed diff --git a/pandora_console/pandoradb.data.oracle.sql b/pandora_console/pandoradb.data.oracle.sql index bf47152672..819234f17d 100644 --- a/pandora_console/pandoradb.data.oracle.sql +++ b/pandora_console/pandoradb.data.oracle.sql @@ -301,8 +301,8 @@ END;; -- BEGIN LOCK TABLE tnews IN EXCLUSIVE MODE; -INSERT INTO tnews (id_news, author, subject, text, timestamp) VALUES (1,'admin','Welcome to Pandora FMS 3.2!','This is the new Pandora FMS Console. A lot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.

The Pandora FMS Team.',current_timestamp); -INSERT INTO tnews (id_news, author, subject, text, timestamp) VALUES (2,'admin','New GIS Feature','Try our new GIS representation, activate GIS in Setup to see new available options.',current_timestamp); +INSERT INTO tnews (id_news, author, subject, text, timestamp) VALUES (1,'admin','Welcome to Pandora FMS 34.0','This is the new Pandora FMS Console. A lot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.

The Pandora FMS Team.',current_timestamp); +INSERT INTO tnews (id_news, author, subject, text, timestamp) VALUES (2,'admin','New Pandora FMS Agent Features','Feel free to test our new features for both Windows and Linux agents: Proxy and Broker modes.',current_timestamp); COMMIT; END;; diff --git a/pandora_console/pandoradb.data.postgreSQL.sql b/pandora_console/pandoradb.data.postgreSQL.sql index b569a4b009..8ecbbe8ab9 100644 --- a/pandora_console/pandoradb.data.postgreSQL.sql +++ b/pandora_console/pandoradb.data.postgreSQL.sql @@ -14,7 +14,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- Database Data for Pandora FMS 3.2 +-- Database Data for Pandora FMS 4.0dev -- PLEASE NO NOT USE MULTILINE COMMENTS -- Because Pandora Installer don't understand them @@ -262,8 +262,12 @@ SELECT setval('tusuario_perfil_id_up_seq', (SELECT (SELECT MAX(id_up) FROM tusua INSERT INTO "tperfil" VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,1,0),(4,'Group coordinator',1,1,1,1,1,1,1,0,0,0),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1); SELECT setval('tperfil_id_perfil_seq', (SELECT (SELECT MAX(id_perfil) FROM tperfil))); -INSERT INTO "tnews" ("id_news", "author", "subject", "text", "timestamp") VALUES (1,'admin','Welcome to Pandora FMS 3.2!','This is the new Pandora FMS Console. A lot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.',NOW()), -(2,'admin','New GIS Feature','Try our new GIS representation, activate GIS in Setup to see new available options.',NOW()); +-- +-- Dumping data for table "tnews" +-- + +INSERT INTO "tnews" ("id_news", "author", "subject", "text", "timestamp") VALUES (1,'admin','Welcome to Pandora FMS 4.0!','This is the new Pandora FMS Console. A lot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.',NOW()), +(2,'admin','New Pandora FMS Agent Features','Feel free to test our new features for both Windows and Linux agents: Proxy and Broker modes.',NOW()); SELECT setval('tnews_id_news_seq', (SELECT (SELECT MAX(id_news) FROM tnews))); INSERT INTO tmodule VALUES (1,'Agent module'); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index d4eb5115f8..ea30c0b745 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -266,8 +266,12 @@ INSERT INTO `tusuario_perfil` VALUES (1,'admin',5,0,'admin',0); INSERT INTO `tperfil` VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,0,0),(4,'Group coordinator',1,1,1,1,1,1,1,0,1,0),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1); -INSERT INTO `tnews` VALUES (1,'admin','Welcome to Pandora FMS 3.2!','This is the new Pandora FMS Console. A l/ot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.',NOW()), -(2,'admin','New GIS Feature','Try our new GIS representation, activate GIS in Setup to see new available options.',NOW()); +-- +-- Dumping data for table `tnews` +-- + +INSERT INTO `tnews` VALUES (1,'admin','Welcome to Pandora FMS 4.0!','This is the new Pandora FMS Console. A lot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.',NOW()), +(2,'admin','New Pandora FMS Agent Features','Feel free to test our new features for both Windows and Linux agents: Proxy and Broker modes.',NOW()); INSERT INTO tmodule VALUES (1,'Agent module'); INSERT INTO tmodule VALUES (2,'Network module');