diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ceb3b148a4..970b4d77cd 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2013-01-17 Juan Manuel Ramon + + * pandoradb.sql + pandoradb.postgreSQL.sql + pandoradb.oracle.sql + extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql + extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql + extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Changed + wizard level by default. + 2013-01-17 Sergio Martin * operation/users/user_edit.php: Adapted the user edit diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql index 19f22ca8eb..85786d6c4c 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql @@ -175,7 +175,7 @@ UPDATE `tagente_modulo` SET max_retries=plugin_pass WHERE id_modulo=7; -- ---------------------------------------------------------------------- ALTER TABLE `tnetwork_component` CHANGE COLUMN `post_process` `post_process` double(18,5) default NULL; ALTER TABLE `tnetwork_component` ADD COLUMN `unit` TEXT NOT NULL AFTER `post_process`; -ALTER TABLE `tnetwork_component` ADD COLUMN `wizard_level` enum('basic','advanced','nowizard') default 'nowizard'; +ALTER TABLE `tnetwork_component` ADD COLUMN `wizard_level` enum('basic','advanced') default 'basic'; ALTER TABLE `tnetwork_component` ADD COLUMN `macros` text; ALTER TABLE `tnetwork_component` ADD COLUMN `critical_instructions` TEXT NOT NULL default ''; ALTER TABLE `tnetwork_component` ADD COLUMN `warning_instructions` TEXT NOT NULL default ''; diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql index 6b7f6063c6..4a67a5c189 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql @@ -300,8 +300,8 @@ WHERE token='prominent_time'; -- ----------------------------------------------------- -- Table tnetwork_component -- ----------------------------------------------------- -ALTER TABLE tnetwork_component ADD (wizard_level VARCHAR2(100) default 'nowizard' NOT NULL); -ALTER TABLE tnetwork_component ADD CONSTRAINT t_network_component_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','nowizard')); +ALTER TABLE tnetwork_component ADD (wizard_level VARCHAR2(100) default 'basic' NOT NULL); +ALTER TABLE tnetwork_component ADD CONSTRAINT t_network_component_wizard_level_cons CHECK (wizard_level IN ('basic','advanced')); ALTER TABLE tnetwork_component ADD (macros CLOB default ''); diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql index ce67a1d930..cd3dcb4300 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql @@ -316,8 +316,8 @@ WHERE "token"='prominent_time'; -- Table "tnetwork_component" -- ----------------------------------------------------- -CREATE TYPE type_tnetwork_component_wizard_level AS ENUM ('basic','advanced','nowizard'); -ALTER TABLE "tnetwork_component" ADD COLUMN "wizard_level" type_tnetwork_component_wizard_level default 'nowizard'; +CREATE TYPE type_tnetwork_component_wizard_level AS ENUM ('basic','advanced'); +ALTER TABLE "tnetwork_component" ADD COLUMN "wizard_level" type_tnetwork_component_wizard_level default 'basic'; ALTER TABLE "tnetwork_component" ADD COLUMN "macros" TEXT default ''; -- ----------------------------------------------------- diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index 610d962fa7..daa97417b2 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -676,7 +676,7 @@ CREATE TABLE tnetwork_component ( custom_integer_2 INTEGER default 0, post_process BINARY_DOUBLE default 0. unit CLOB default '', - wizard_level VARCHAR2(100) default 'nowizard' NOT NULL, + wizard_level VARCHAR2(100) default 'basic' NOT NULL, macros CLOB default '', critical_instructions VARCHAR2(255) default '', warning_instructions VARCHAR2(255) default '', @@ -685,7 +685,7 @@ CREATE TABLE tnetwork_component ( warning_inverse NUMBER(1, 0) default 0 NOT NULL, id_category NUMBER(10, 0) default 0 NOT NULL, tags CLOB, - CONSTRAINT t_network_component_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','nowizard')) + CONSTRAINT t_network_component_wizard_level_cons CHECK (wizard_level IN ('basic','advanced')) ); CREATE SEQUENCE tnetwork_component_s INCREMENT BY 1 START WITH 1; diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index d324f424a8..e53bf7b9a8 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -537,7 +537,7 @@ CREATE TABLE "tmodule_group" ( -- --------------------------------------------------------------------- -- Table `tnetwork_component` -- --------------------------------------------------------------------- -CREATE TYPE type_tlocal_component_wizard_level AS ENUM ('basic','advanced','nowizard'); +CREATE TYPE type_tlocal_component_wizard_level AS ENUM ('basic','advanced'); CREATE TABLE "tnetwork_component" ( "id_nc" SERIAL NOT NULL PRIMARY KEY, "name" varchar(80) NOT NULL, @@ -575,7 +575,7 @@ CREATE TABLE "tnetwork_component" ( "custom_integer_2" INTEGER default 0, "post_process" DOUBLE PRECISION default 0, "unit" TEXT default '', - "wizard_level" type_tlocal_component_wizard_level default 'nowizard', + "wizard_level" type_tlocal_component_wizard_level default 'basic', "macros" TEXT default '', "critical_instructions" TEXT default '', "warning_instructions" TEXT default '', diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 6468ec9251..f964feb5c4 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -632,7 +632,7 @@ CREATE TABLE IF NOT EXISTS `tnetwork_component` ( `custom_integer_2` int(10) default 0, `post_process` double(18,5) default 0, `unit` text, - `wizard_level` enum('basic','advanced','nowizard') default 'nowizard', + `wizard_level` enum('basic','advanced') default 'basic', `macros` text, `critical_instructions` text NOT NULL default '', `warning_instructions` text NOT NULL default '',