Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/pandorafms/pandorafms in…
Browse files Browse the repository at this point in the history 
…to develop
  • Loading branch information
@vgilc
vgilc committed Apr 6, 2015
2 parents 2635f5e + 533167e commit f159348
Show file tree
Hide file tree
Showing 11 changed files with 103 additions and 43 deletions.
14 changes: 14 additions & 0 deletions pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql
View file
Expand Up @@ -70,3 +70,17 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('post_process_custom_values',
ALTER TABLE `tnetwork_map` ADD COLUMN `id_tag` int(11) DEFAULT 0;
ALTER TABLE `tnetwork_map` ADD COLUMN `store_group` int(11) DEFAULT 0;
UPDATE `tnetwork_map` SET `store_group` = `id_group`;

-- ---------------------------------------------------------------------
-- Table `tperfil`
-- ---------------------------------------------------------------------
ALTER TABLE `tperfil` ADD COLUMN `map_view` tinyint(1) NOT NULL DEFAULT 0;
ALTER TABLE `tperfil` ADD COLUMN `map_edit` tinyint(1) NOT NULL DEFAULT 0;
ALTER TABLE `tperfil` ADD COLUMN `map_management` tinyint(1) NOT NULL DEFAULT 0;
ALTER TABLE `tperfil` ADD COLUMN `vconsole_view` tinyint(1) NOT NULL DEFAULT 0;
ALTER TABLE `tperfil` ADD COLUMN `vconsole_edit` tinyint(1) NOT NULL DEFAULT 0;
ALTER TABLE `tperfil` ADD COLUMN `vconsole_management` tinyint(1) NOT NULL DEFAULT 0;

UPDATE `tperfil` SET `map_view` = 1, `vconsole_view` = 1 WHERE `report_view` = 1;
UPDATE `tperfil` SET `map_edit` = 1, `vconsole_edit` = 1 WHERE `report_edit` = 1;
UPDATE `tperfil` SET `map_management` = 1, `vconsole_management` = 1 WHERE `report_management` = 1;
14 changes: 14 additions & 0 deletions pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql
View file
Expand Up @@ -70,3 +70,17 @@ INSERT INTO tconfig (token, value) VALUES ('post_process_custom_values', '{"0.00
ALTER TABLE tnetwork_map ADD COLUMN id_tag NUMBER(11, 0) DEFAULT 0;
ALTER TABLE tnetwork_map ADD COLUMN store_group NUMBER(11, 0) DEFAULT 0;
UPDATE tnetwork_map SET store_group = id_group;

-- ---------------------------------------------------------------------
-- Table `tperfil`
-- ---------------------------------------------------------------------
ALTER TABLE tperfil ADD COLUMN map_view NUMBER(1, 0) DEFAULT 0 NOT NULL;
ALTER TABLE tperfil ADD COLUMN map_edit NUMBER(1, 0) DEFAULT 0 NOT NULL;
ALTER TABLE tperfil ADD COLUMN map_management NUMBER(1, 0) DEFAULT 0 NOT NULL;
ALTER TABLE tperfil ADD COLUMN vconsole_view NUMBER(1, 0) DEFAULT 0 NOT NULL;
ALTER TABLE tperfil ADD COLUMN vconsole_edit NUMBER(1, 0) DEFAULT 0 NOT NULL;
ALTER TABLE tperfil ADD COLUMN vconsole_management NUMBER(1, 0) DEFAULT 0 NOT NULL;

UPDATE tperfil SET map_view = 1, vconsole_view = 1 WHERE report_view = 1;
UPDATE tperfil SET map_edit = 1, vconsole_edit = 1 WHERE report_edit = 1;
UPDATE tperfil SET map_management = 1, vconsole_management = 1 WHERE report_management = 1;
14 changes: 14 additions & 0 deletions pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql
View file
Expand Up @@ -68,3 +68,17 @@ INSERT INTO "tconfig" ("token", "value") VALUES ('post_process_custom_values', '
ALTER TABLE "tnetwork_map" ADD COLUMN "id_tag" INTEGER DEFAULT 0;
ALTER TABLE "tnetwork_map" ADD COLUMN "store_group" INTEGER DEFAULT 0;
UPDATE "tnetwork_map" SET "store_group" = "id_group";

-- ---------------------------------------------------------------------
-- Table `tperfil`
-- ---------------------------------------------------------------------
ALTER TABLE "tperfil" ADD COLUMN "map_view" SMALLINT NOT NULL DEFAULT 0;
ALTER TABLE "tperfil" ADD COLUMN "map_edit" SMALLINT NOT NULL DEFAULT 0;
ALTER TABLE "tperfil" ADD COLUMN "map_management" SMALLINT NOT NULL DEFAULT 0;
ALTER TABLE "tperfil" ADD COLUMN "vconsole_view" SMALLINT NOT NULL DEFAULT 0;
ALTER TABLE "tperfil" ADD COLUMN "vconsole_edit" SMALLINT NOT NULL DEFAULT 0;
ALTER TABLE "tperfil" ADD COLUMN "vconsole_management" SMALLINT NOT NULL DEFAULT 0;

UPDATE "tperfil" SET "map_view" = 1, "vconsole_view" = 1 WHERE "report_view" = 1;
UPDATE "tperfil" SET "map_edit" = 1, "vconsole_edit" = 1 WHERE "report_edit" = 1;
UPDATE "tperfil" SET "map_management" = 1, "vconsole_management" = 1 WHERE "report_management" = 1;
Binary file added pandora_console/images/pandora.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion pandora_console/include/javascript/tree/TreeController.js
View file
Expand Up @@ -46,7 +46,7 @@ TreeController = {
$group
.addClass("tree-root")
.hide()
.prepend('<img src="'+(controller.baseURL.length > 0 ? controller.baseURL : '')+'images/pandora.ico.gif" />');
.prepend('<img src="'+(controller.baseURL.length > 0 ? controller.baseURL : '')+'images/pandora.png" />');
}
// Normal group
else {
Expand Down
10 changes: 5 additions & 5 deletions pandora_console/pandoradb.data.oracle.sql
View file
Expand Up @@ -317,11 +317,11 @@ END;;
--
BEGIN
LOCK TABLE tperfil IN EXCLUSIVE MODE;
INSERT INTO tperfil VALUES (1,'Operator&#x20;&#40;Read&#41;',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0);
INSERT INTO tperfil VALUES (2,'Operator&#x20;&#40;Write&#41;',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0);
INSERT INTO tperfil VALUES (3,'Chief&#x20;Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1);
INSERT INTO tperfil VALUES (4,'Group&#x20;coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1);
INSERT INTO tperfil VALUES (5,'Pandora&#x20;Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
INSERT INTO tperfil VALUES (1,'Operator&#x20;&#40;Read&#41;',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0);
INSERT INTO tperfil VALUES (2,'Operator&#x20;&#40;Write&#41;',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0);
INSERT INTO tperfil VALUES (3,'Chief&#x20;Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1,1,1,1,1,1,1);
INSERT INTO tperfil VALUES (4,'Group&#x20;coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1);
INSERT INTO tperfil VALUES (5,'Pandora&#x20;Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
COMMIT;
END;;

Expand Down
2 changes: 1 addition & 1 deletion pandora_console/pandoradb.data.postgreSQL.sql
View file
Expand Up @@ -289,7 +289,7 @@ SELECT setval('tusuario_perfil_id_up_seq', (SELECT (SELECT MAX(id_up) FROM tusua
--
-- Dumping data for table "tperfil"
--
INSERT INTO "tperfil" VALUES (1,'Operator&#x20;&#40;Read&#41;',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0),(2,'Operator&#x20;&#40;Write&#41;',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0),(3,'Chief&#x20;Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1),(4,'Group&#x20;coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1),(5,'Pandora&#x20;Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
INSERT INTO "tperfil" VALUES (1,'Operator&#x20;&#40;Read&#41;',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0),(2,'Operator&#x20;&#40;Write&#41;',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0),(3,'Chief&#x20;Operator',1,1,1,1,0,0,0,0,1,0,1,1,1,1,1,0,1,1,1,1,1,1,1),(4,'Group&#x20;coordinator',1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1),(5,'Pandora&#x20;Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
SELECT setval('tperfil_id_perfil_seq', (SELECT (SELECT MAX(id_perfil) FROM tperfil)));

--
Expand Down
40 changes: 23 additions & 17 deletions pandora_console/pandoradb.oracle.sql
View file
Expand Up @@ -823,23 +823,29 @@ CREATE TABLE torigen (
CREATE TABLE tperfil (
id_perfil NUMBER(10, 0) NOT NULL PRIMARY KEY,
name CLOB default '',
incident_edit NUMBER(5, 0) default 0 NOT NULL,
incident_view NUMBER(5, 0) default 0 NOT NULL,
incident_management NUMBER(5, 0) default 0 NOT NULL,
agent_view NUMBER(5, 0) default 0 NOT NULL,
agent_edit NUMBER(5, 0) default 0 NOT NULL,
alert_edit NUMBER(5, 0) default 0 NOT NULL,
user_management NUMBER(5, 0) default 0 NOT NULL,
db_management NUMBER(5, 0) default 0 NOT NULL,
alert_management NUMBER(5, 0) default 0 NOT NULL,
pandora_management NUMBER(5, 0) default 0 NOT NULL,
report_view NUMBER(5, 0) default 0 NOT NULL,
report_edit NUMBER(5, 0) default 0 NOT NULL,
report_management NUMBER(5, 0) default 0 NOT NULL,
event_view NUMBER(5, 0) default 0 NOT NULL,
event_edit NUMBER(5, 0) default 0 NOT NULL,
event_management NUMBER(5, 0) default 0 NOT NULL,
agent_disable NUMBER(5, 0) default 0 NOT NULL
incident_edit NUMBER(1, 0) default 0 NOT NULL,
incident_view NUMBER(1, 0) default 0 NOT NULL,
incident_management NUMBER(1, 0) default 0 NOT NULL,
agent_view NUMBER(1, 0) default 0 NOT NULL,
agent_edit NUMBER(1, 0) default 0 NOT NULL,
alert_edit NUMBER(1, 0) default 0 NOT NULL,
user_management NUMBER(1, 0) default 0 NOT NULL,
db_management NUMBER(1, 0) default 0 NOT NULL,
alert_management NUMBER(1, 0) default 0 NOT NULL,
pandora_management NUMBER(1, 0) default 0 NOT NULL,
report_view NUMBER(1, 0) default 0 NOT NULL,
report_edit NUMBER(1, 0) default 0 NOT NULL,
report_management NUMBER(1, 0) default 0 NOT NULL,
event_view NUMBER(1, 0) default 0 NOT NULL,
event_edit NUMBER(1, 0) default 0 NOT NULL,
event_management NUMBER(1, 0) default 0 NOT NULL,
agent_disable NUMBER(1, 0) default 0 NOT NULL,
map_view NUMBER(1, 0) default 0 NOT NULL,
map_edit NUMBER(1, 0) default 0 NOT NULL,
map_management NUMBER(1, 0) default 0 NOT NULL,
vconsole_view NUMBER(1, 0) default 0 NOT NULL,
vconsole_edit NUMBER(1, 0) default 0 NOT NULL,
vconsole_management NUMBER(1, 0) default 0 NOT NULL
);

CREATE SEQUENCE tperfil_s INCREMENT BY 1 START WITH 1;
Expand Down
8 changes: 7 additions & 1 deletion pandora_console/pandoradb.postgreSQL.sql
View file
Expand Up @@ -738,7 +738,13 @@ CREATE TABLE "tperfil" (
"event_view" SMALLINT NOT NULL default 0,
"event_edit" SMALLINT NOT NULL default 0,
"event_management" SMALLINT NOT NULL default 0,
"agent_disable" SMALLINT NOT NULL default 0
"agent_disable" SMALLINT NOT NULL default 0,
"map_view" SMALLINT NOT NULL default 0,
"map_edit" SMALLINT NOT NULL default 0,
"map_management" SMALLINT NOT NULL default 0,
"vconsole_view" SMALLINT NOT NULL default 0,
"vconsole_edit" SMALLINT NOT NULL default 0,
"vconsole_management" SMALLINT NOT NULL default 0
);

-- ---------------------------------------------------------------------
Expand Down
40 changes: 23 additions & 17 deletions pandora_console/pandoradb.sql
View file
Expand Up @@ -782,23 +782,29 @@ CREATE TABLE IF NOT EXISTS `torigen` (
CREATE TABLE IF NOT EXISTS `tperfil` (
`id_perfil` int(10) unsigned NOT NULL auto_increment,
`name` TEXT NOT NULL,
`incident_edit` tinyint(3) NOT NULL default '0',
`incident_view` tinyint(3) NOT NULL default '0',
`incident_management` tinyint(3) NOT NULL default '0',
`agent_view` tinyint(3) NOT NULL default '0',
`agent_edit` tinyint(3) NOT NULL default '0',
`alert_edit` tinyint(3) NOT NULL default '0',
`user_management` tinyint(3) NOT NULL default '0',
`db_management` tinyint(3) NOT NULL default '0',
`alert_management` tinyint(3) NOT NULL default '0',
`pandora_management` tinyint(3) NOT NULL default '0',
`report_view` tinyint(3) NOT NULL default '0',
`report_edit` tinyint(3) NOT NULL default '0',
`report_management` tinyint(3) NOT NULL default '0',
`event_view` tinyint(3) NOT NULL default '0',
`event_edit` tinyint(3) NOT NULL default '0',
`event_management` tinyint(3) NOT NULL default '0',
`agent_disable` tinyint(3) NOT NULL default '0',
`incident_edit` tinyint(1) NOT NULL DEFAULT 0,
`incident_view` tinyint(1) NOT NULL DEFAULT 0,
`incident_management` tinyint(1) NOT NULL DEFAULT 0,
`agent_view` tinyint(1) NOT NULL DEFAULT 0,
`agent_edit` tinyint(1) NOT NULL DEFAULT 0,
`alert_edit` tinyint(1) NOT NULL DEFAULT 0,
`user_management` tinyint(1) NOT NULL DEFAULT 0,
`db_management` tinyint(1) NOT NULL DEFAULT 0,
`alert_management` tinyint(1) NOT NULL DEFAULT 0,
`pandora_management` tinyint(1) NOT NULL DEFAULT 0,
`report_view` tinyint(1) NOT NULL DEFAULT 0,
`report_edit` tinyint(1) NOT NULL DEFAULT 0,
`report_management` tinyint(1) NOT NULL DEFAULT 0,
`event_view` tinyint(1) NOT NULL DEFAULT 0,
`event_edit` tinyint(1) NOT NULL DEFAULT 0,
`event_management` tinyint(1) NOT NULL DEFAULT 0,
`agent_disable` tinyint(1) NOT NULL DEFAULT 0,
`map_view` tinyint(1) NOT NULL DEFAULT 0,
`map_edit` tinyint(1) NOT NULL DEFAULT 0,
`map_management` tinyint(1) NOT NULL DEFAULT 0,
`vconsole_view` tinyint(1) NOT NULL DEFAULT 0,
`vconsole_edit` tinyint(1) NOT NULL DEFAULT 0,
`vconsole_management` tinyint(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id_perfil`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

Expand Down
2 changes: 1 addition & 1 deletion pandora_console/pandoradb_data.sql
View file
Expand Up @@ -279,7 +279,7 @@ INSERT INTO `tusuario_perfil` (`id_up`, `id_usuario`, `id_perfil`, `id_grupo`, `
-- Dumping data for table `tperfil`
--

INSERT INTO `tperfil` VALUES (1,'Operator&#x20;&#40;Read&#41;',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0),(2,'Operator&#x20;&#40;Write&#41;',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0),(3,'Chief&#x20;Operator',1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1),(4,'Group&#x20;coordinator',1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,1),(5,'Pandora&#x20;Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);
INSERT INTO `tperfil` VALUES (1,'Operator&#x20;&#40;Read&#41;',0,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,0),(2,'Operator&#x20;&#40;Write&#41;',1,1,0,1,0,0,0,0,0,0,1,1,0,1,1,0,0,1,1,0,1,1,0),(3,'Chief&#x20;Operator',1,1,1,1,0,0,0,0,0,0,1,1,1,1,1,0,1,1,1,1,1,1,1),(4,'Group&#x20;coordinator',1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1),(5,'Pandora&#x20;Administrator',1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1);

--
-- Dumping data for table `tnews`
Expand Down

0 comments on commit f159348

Please sign in to comment.