From a728aaa8cea2ec1e592656dd8a70634c94cfeec0 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 23 Jul 2015 14:14:09 -0400 Subject: [PATCH 1/8] 0017842: No aparecen varios usuarios para la asignacion --- workflow/engine/src/ProcessMaker/BusinessModel/Task.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index e366e419f..775c105e4 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -1003,7 +1003,7 @@ class Task } } } else { - $limit = 1000; + $limit = count($aUsers)+1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; From 9c6045f1a16c8b06e588bd609c9f37f8420bbf20 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 23 Jul 2015 14:16:13 -0400 Subject: [PATCH 2/8] 0017842: No aparecen varios usuarios para la asignacion --- workflow/engine/src/ProcessMaker/BusinessModel/Task.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index 775c105e4..9c43ae230 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -1003,7 +1003,7 @@ class Task } } } else { - $limit = count($aUsers)+1; + $limit = count($aUsers) + 1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; From 267f11194a187fd44c9583d8ba51af37150f7b05 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 23 Jul 2015 14:24:22 -0400 Subject: [PATCH 3/8] PM-3154 0017842: No aparecen varios usuarios para la asignacion --- workflow/engine/src/ProcessMaker/BusinessModel/Task.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index 9c43ae230..d0e93cf00 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -1003,7 +1003,7 @@ class Task } } } else { - $limit = count($aUsers) + 1; + $limit = count($aUsers)+1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; @@ -1371,7 +1371,7 @@ class Task } } } else { - $limit = 1000; + $limit = count($aUsers)+1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; @@ -1504,7 +1504,7 @@ class Task } } } else { - $limit = 1000; + $limit = count($aUsers)+1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; From f77d043e53b3b2bb358dec7e82e27257a64c9976 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 23 Jul 2015 14:26:40 -0400 Subject: [PATCH 4/8] PM-3154 0017842: No aparecen varios usuarios para la asignacion --- workflow/engine/src/ProcessMaker/BusinessModel/Task.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index d0e93cf00..50caa5c93 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -870,7 +870,7 @@ class Task } } } else { - $limit = 1000; + $limit = count($aUsers)+1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; @@ -1924,7 +1924,7 @@ class Task } } } else { - $limit = 1000; + $limit = count($aUsersGroups)+1; } $aUsersGroups = $this->arrayPagination($aUsersGroups, $start, $limit); return $aUsersGroups; @@ -2042,7 +2042,7 @@ class Task } } } else { - $limit = 1000; + $limit = count($aUsersGroups)+1; } $aUsersGroups = $this->arrayPagination($aUsersGroups, $start, $limit); return $aUsersGroups; From c3508e770ded9911b1ebffd9d12cc7de12e8755f Mon Sep 17 00:00:00 2001 From: dheeyi Date: Mon, 3 Aug 2015 15:51:34 -0400 Subject: [PATCH 5/8] =?UTF-8?q?PM-3188=200017892:=20Error=20al=20conectar?= =?UTF-8?q?=20al=20listar=20variables=20y=20conexiones=20a=20base=20de=20d?= =?UTF-8?q?atos=20con=20contrase=C3=B1largas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/config/schema.xml | 2 +- workflow/engine/data/mysql/schema.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index f0713647a..08566c00a 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -1683,7 +1683,7 @@ - + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 29afe4065..c3c6b7a1b 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -809,7 +809,7 @@ CREATE TABLE `DB_SOURCE` `DBS_SERVER` VARCHAR(100) default '0' NOT NULL, `DBS_DATABASE_NAME` VARCHAR(100) default '0' NOT NULL, `DBS_USERNAME` VARCHAR(32) default '0' NOT NULL, - `DBS_PASSWORD` VARCHAR(32) default '', + `DBS_PASSWORD` VARCHAR(256) default '', `DBS_PORT` INTEGER default 0, `DBS_ENCODE` VARCHAR(32) default '', `DBS_CONNECTION_TYPE` VARCHAR(32) default 'NORMAL', From b33c0ab20d8b2faf988259d9c86e9ee541d32e23 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Mon, 3 Aug 2015 16:25:50 -0400 Subject: [PATCH 6/8] test --- workflow/engine/src/ProcessMaker/BusinessModel/Task.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index 50caa5c93..8a43bfa06 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -870,7 +870,7 @@ class Task } } } else { - $limit = count($aUsers)+1; + $limit = count($aUsers)+1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; From 4e6f58eabea90e74abd5fb9b882653db9c5e7474 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Mon, 3 Aug 2015 16:29:36 -0400 Subject: [PATCH 7/8] =?UTF-8?q?PM-3188=200017892:=20Error=20al=20conectar?= =?UTF-8?q?=20al=20listar=20variables=20y=20conexiones=20a=20base=20de=20d?= =?UTF-8?q?atos=20con=20contrase=C3=B1largas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/config/schema.xml | 2 +- workflow/engine/data/mysql/schema.sql | 2 +- workflow/engine/src/ProcessMaker/BusinessModel/Task.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 08566c00a..8ac8a006b 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -1683,7 +1683,7 @@ - + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index c3c6b7a1b..6c4ddbb83 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -809,7 +809,7 @@ CREATE TABLE `DB_SOURCE` `DBS_SERVER` VARCHAR(100) default '0' NOT NULL, `DBS_DATABASE_NAME` VARCHAR(100) default '0' NOT NULL, `DBS_USERNAME` VARCHAR(32) default '0' NOT NULL, - `DBS_PASSWORD` VARCHAR(256) default '', + `DBS_PASSWORD` VARCHAR(256) default '', `DBS_PORT` INTEGER default 0, `DBS_ENCODE` VARCHAR(32) default '', `DBS_CONNECTION_TYPE` VARCHAR(32) default 'NORMAL', diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index 8a43bfa06..50caa5c93 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -870,7 +870,7 @@ class Task } } } else { - $limit = count($aUsers)+1; + $limit = count($aUsers)+1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; From b76f2b26b27d29da46baba715d8337a7896929d0 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Mon, 3 Aug 2015 16:33:10 -0400 Subject: [PATCH 8/8] =?UTF-8?q?PM-3188=200017892:=20Error=20al=20conectar?= =?UTF-8?q?=20al=20listar=20variables=20y=20conexiones=20a=20base=20de=20d?= =?UTF-8?q?atos=20con=20contrase=C3=B1largas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/config/schema.xml | 2 +- workflow/engine/data/mysql/schema.sql | 2 +- .../engine/src/ProcessMaker/BusinessModel/Task.php | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 8ac8a006b..08566c00a 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -1683,7 +1683,7 @@ - + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 6c4ddbb83..c3c6b7a1b 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -809,7 +809,7 @@ CREATE TABLE `DB_SOURCE` `DBS_SERVER` VARCHAR(100) default '0' NOT NULL, `DBS_DATABASE_NAME` VARCHAR(100) default '0' NOT NULL, `DBS_USERNAME` VARCHAR(32) default '0' NOT NULL, - `DBS_PASSWORD` VARCHAR(256) default '', + `DBS_PASSWORD` VARCHAR(256) default '', `DBS_PORT` INTEGER default 0, `DBS_ENCODE` VARCHAR(32) default '', `DBS_CONNECTION_TYPE` VARCHAR(32) default 'NORMAL', diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php index 50caa5c93..91a978e6e 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Task.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Task.php @@ -870,7 +870,7 @@ class Task } } } else { - $limit = count($aUsers)+1; + $limit = count($aUsers) + 1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; @@ -1003,7 +1003,7 @@ class Task } } } else { - $limit = count($aUsers)+1; + $limit = count($aUsers) + 1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; @@ -1371,7 +1371,7 @@ class Task } } } else { - $limit = count($aUsers)+1; + $limit = count($aUsers) + 1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; @@ -1504,7 +1504,7 @@ class Task } } } else { - $limit = count($aUsers)+1; + $limit = count($aUsers) + 1; } $aUsers = $this->arrayPagination($aUsers, $start, $limit); return $aUsers; @@ -1924,7 +1924,7 @@ class Task } } } else { - $limit = count($aUsersGroups)+1; + $limit = count($aUsersGroups) + 1; } $aUsersGroups = $this->arrayPagination($aUsersGroups, $start, $limit); return $aUsersGroups; @@ -2042,7 +2042,7 @@ class Task } } } else { - $limit = count($aUsersGroups)+1; + $limit = count($aUsersGroups) + 1; } $aUsersGroups = $this->arrayPagination($aUsersGroups, $start, $limit); return $aUsersGroups;