tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-04-03 Vanessa Gil <vanessa.gil@artica.es> 

* pandoradb.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql,
	  extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql,
	  extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql,
	  include/functions_groups.php: : removed 'created_by'
	to tusuario table and modify select users.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5878 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-04-03 09:08:42 +00:00
parent b1b60818eb
commit b8fd0e493b
6 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2012-04-03 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql,
extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql,
extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql,
include/functions_groups.php: : removed 'created_by'
to tusuario table and modify select users.
2012-04-02 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/menu.php,

5
pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
View File

@ -193,11 +193,6 @@ ALTER TABLE `tusuario` ADD COLUMN `data_section` TEXT NOT NULL;
-- -----------------------------------------------------
ALTER TABLE `treport_content_item` ADD COLUMN `operation` TEXT DEFAULT '';
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE `tusuario` ADD COLUMN `created_by` TEXT NOT NULL DEFAULT '';
-- -----------------------------------------------------
-- Table `tmensajes`
-- -----------------------------------------------------

5
pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
View File

@ -189,11 +189,6 @@ ALTER TABLE tusuario ADD (data_section VARCHAR2(255) NOT NULL);
-- -----------------------------------------------------
ALTER TABLE treport_content_item ADD (operation CLOB default '');
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE tusuario ADD (created_by VARCHAR2(255) NOT NULL DEFAULT '';
-- -----------------------------------------------------
-- Table `tmensajes`
-- -----------------------------------------------------

5
pandora_console/extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql
View File

@ -181,11 +181,6 @@ ALTER TABLE "tusuario" ADD COLUMN "data_section" varchar(255) NOT NULL DEFAULT '
-- -----------------------------------------------------
ALTER TABLE "treport_content_item" ADD COLUMN "operation" text default '';
-- -----------------------------------------------------
-- Table `tusuario`
-- -----------------------------------------------------
ALTER TABLE "tusuario" ADD COLUMN "created_by" varchar(255) NOT NULL DEFAULT '';
-- -----------------------------------------------------
-- Table `tmensajes`
-- -----------------------------------------------------

13
pandora_console/include/functions_groups.php
View File

@ -570,11 +570,6 @@ function groups_get_users ($id_group, $filter = false) {
if (! is_array ($filter))
$filter = array ();
//Users created by user
$filter['created_by'] = $config['id_user'];
$users_created = db_get_all_rows_filter ("tusuario", $filter);
unset($filter['created_by']);
$filter['id_grupo'] = $id_group;
$resulta = array();
@ -594,14 +589,6 @@ function groups_get_users ($id_group, $filter = false) {
else
$result = array_merge($resulta,$resultb);
if ($result === false)
return array ();
else {
if ($users_created !== false) {
$result = array_merge($result, $users_created);
}
}
//This removes stale users from the list. This can happen if switched to another auth scheme
//(internal users still exist) or external auth has users removed/inactivated from the list (eg. LDAP)
$retval = array ();

1
pandora_console/pandoradb.sql
View File

@ -777,7 +777,6 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
`shortcut_data` text default '',
`section` TEXT NOT NULL,
`data_section` TEXT NOT NULL,
`created_by` TEXT NOT NULL,
UNIQUE KEY `id_user` (`id_user`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;