diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql index 8330127b63..f2bebfbf44 100644 --- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql @@ -2,4 +2,14 @@ -- Table `tlayout` -- --------------------------------------------------------------------- -ALTER TABLE tlayout DROP COLUMN fullscreen; \ No newline at end of file +ALTER TABLE tlayout DROP COLUMN fullscreen; + +-- --------------------------------------------------------------------- +-- Table `tlayout_data` +-- --------------------------------------------------------------------- + +ALTER TABLE tlayout_data DROP COLUMN no_link_color; + + + + diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql index 8330127b63..7f8a66c676 100644 --- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql @@ -2,4 +2,10 @@ -- Table `tlayout` -- --------------------------------------------------------------------- -ALTER TABLE tlayout DROP COLUMN fullscreen; \ No newline at end of file +ALTER TABLE tlayout DROP COLUMN fullscreen; + +-- --------------------------------------------------------------------- +-- Table `tlayout_data` +-- --------------------------------------------------------------------- + +ALTER TABLE tlayout_data DROP COLUMN no_link_color; \ No newline at end of file diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql index 20c9dcd0e4..24e634274c 100644 --- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql @@ -2,4 +2,10 @@ -- Table `tlayout` -- --------------------------------------------------------------------- -ALTER TABLE "tlayout" DROP COLUMN "fullscreen"; \ No newline at end of file +ALTER TABLE "tlayout" DROP COLUMN "fullscreen"; + +-- --------------------------------------------------------------------- +-- Table `tlayout_data` +-- --------------------------------------------------------------------- + +ALTER TABLE "tlayout_data" DROP COLUMN "no_link_color"; \ No newline at end of file diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index 4a5b41b2bc..825a06f859 100644 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -612,7 +612,6 @@ switch ($action) { $values['id_layout_linked'] = $map_linked; $values['label_color'] = $label_color; $values['parent_item'] = $parent; - $values['no_link_color'] = 1; $values['enable_link'] = $enable_link; $values['id_custom_graph'] = $id_custom_graph; diff --git a/pandora_console/pandoradb.oracle.sql b/pandora_console/pandoradb.oracle.sql index 9c7546483b..0815e9e22e 100644 --- a/pandora_console/pandoradb.oracle.sql +++ b/pandora_console/pandoradb.oracle.sql @@ -1246,7 +1246,6 @@ CREATE TABLE tlayout_data ( id_layout_linked NUMBER(10, 0) default 0 NOT NULL, parent_item NUMBER(10, 0) default 0 NOT NULL, label_color varchar(20) DEFAULT '', - no_link_color NUMBER(5, 0) default 0 NOT NULL, enable_link NUMBER(5, 0) default 1 NOT NULL, id_metaconsole NUMBER(10, 0) default 0 NOT NULL, id_group NUMBER(10, 0) default 0 NOT NULL, diff --git a/pandora_console/pandoradb.postgreSQL.sql b/pandora_console/pandoradb.postgreSQL.sql index c6c3344233..ea657f2e8b 100644 --- a/pandora_console/pandoradb.postgreSQL.sql +++ b/pandora_console/pandoradb.postgreSQL.sql @@ -1098,7 +1098,6 @@ CREATE TABLE "tlayout_data" ( "id_layout_linked" INTEGER NOT NULL default 0, "parent_item" INTEGER NOT NULL default 0, "label_color" varchar(20) DEFAULT '', - "no_link_color" SMALLINT NOT NULL default 0, "enable_link" SMALLINT NOT NULL default 1, "id_metaconsole" INTEGER NOT NULL default 0, "id_group" INTEGER NOT NULL default 0, diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 3a81fad935..7092281a43 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1186,7 +1186,6 @@ CREATE TABLE IF NOT EXISTS `tlayout_data` ( `id_layout_linked` INTEGER unsigned NOT NULL default '0', `parent_item` INTEGER UNSIGNED NOT NULL default 0, `label_color` varchar(20) DEFAULT "", - `no_link_color` tinyint(1) UNSIGNED NOT NULL default 0, `enable_link` tinyint(1) UNSIGNED NOT NULL default 1, `id_metaconsole` int(10) NOT NULL default 0, `id_group` INTEGER UNSIGNED NOT NULL default 0,