Merge remote-tracking branch 'upstream/3.1' into HOR-1007

Conflicts:
	gulliver/system/class.rbac.php
	rbac/engine/data/mysql/insert.sql
This commit is contained in:
Dheeyi William
2016-06-15 09:07:51 -04:00
6 changed files with 157 additions and 4 deletions

View File

@@ -36,7 +36,8 @@ INSERT INTO `RBAC_PERMISSIONS` VALUES
('00000000000000000000000000000035','PM_SETUP_LOGS','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'),
('00000000000000000000000000000036','PM_DELETE_PROCESS_CASES','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'),
('00000000000000000000000000000037','PM_EDITPERSONALINFO_CALENDAR','2016-03-01 00:00:00','2016-03-01 00:00:00',1,'00000000000000000000000000000002'),
('00000000000000000000000000000038','PM_REST_API_APPLICATIONS','2016-06-14 00:00:00','2016-06-14 00:00:00',1,'00000000000000000000000000000002');
('00000000000000000000000000000038','PM_UNCANCELCASE','2016-06-14 00:00:00','2016-06-14 00:00:00',1,'00000000000000000000000000000002'),
('00000000000000000000000000000039','PM_REST_API_APPLICATIONS','2016-06-14 00:00:00','2016-06-14 00:00:00',1,'00000000000000000000000000000002');
INSERT INTO `RBAC_ROLES` VALUES
('00000000000000000000000000000001','','00000000000000000000000000000001','RBAC_ADMIN','2007-07-31 19:10:22','2007-08-03 12:24:36',1),
@@ -84,6 +85,7 @@ INSERT INTO `RBAC_ROLES_PERMISSIONS` VALUES
('00000000000000000000000000000002','00000000000000000000000000000036'),
('00000000000000000000000000000002','00000000000000000000000000000037'),
('00000000000000000000000000000002','00000000000000000000000000000038'),
('00000000000000000000000000000002','00000000000000000000000000000039'),
('00000000000000000000000000000003','00000000000000000000000000000001'),
('00000000000000000000000000000003','00000000000000000000000000000005'),
('00000000000000000000000000000004','00000000000000000000000000000001'),
@@ -119,7 +121,8 @@ INSERT INTO `RBAC_ROLES_PERMISSIONS` VALUES
('00000000000000000000000000000004','00000000000000000000000000000035'),
('00000000000000000000000000000004','00000000000000000000000000000036'),
('00000000000000000000000000000004','00000000000000000000000000000037'),
('00000000000000000000000000000004','00000000000000000000000000000038');
('00000000000000000000000000000004','00000000000000000000000000000038'),
('00000000000000000000000000000004','00000000000000000000000000000039');
INSERT INTO `RBAC_SYSTEMS` VALUES ('00000000000000000000000000000001','RBAC','2007-07-31 19:10:22','2007-08-03 12:24:36',1),('00000000000000000000000000000002','PROCESSMAKER','2007-07-31 19:10:22','2007-08-03 12:24:36',1);
INSERT INTO `RBAC_USERS` VALUES ('00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801fc3','Administrator','','admin@processmaker.com','2020-01-01','2007-08-03 12:24:36','2008-02-13 07:24:07',1,'MYSQL','00000000000000000000000000000000','','');