From ab97676e42ae9cc0ee9c71aa9ee2761c20473a3e Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Fri, 1 Apr 2016 16:59:14 -0400 Subject: [PATCH 1/6] HOR-674 HOR-674 --- workflow/engine/config/schema.xml | 18 ++++++++++++++++++ workflow/engine/data/mysql/schema.sql | 10 ++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index af799202f..f0c301de3 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -1290,6 +1290,9 @@ + + + @@ -1534,6 +1537,9 @@ + + + @@ -2513,6 +2519,18 @@ + + + + + + + + + + + + diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index f3077f40b..0f28a08e0 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -629,7 +629,8 @@ CREATE TABLE `TASK` `TAS_SELFSERVICE_TIME_UNIT` VARCHAR(15) default '', `TAS_SELFSERVICE_TRIGGER_UID` VARCHAR(32) default '', `TAS_SELFSERVICE_EXECUTION` VARCHAR(15) default 'EVERY_TIME', - PRIMARY KEY (`TAS_UID`) + PRIMARY KEY (`TAS_UID`), + KEY `indexTasUid` (`TAS_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Task of workflow'; #----------------------------------------------------------------------------- #-- TASK_USER @@ -726,7 +727,8 @@ CREATE TABLE `USERS` `USR_BOOKMARK_START_CASES` MEDIUMTEXT, `USR_TIME_ZONE` VARCHAR(100) default '', `USR_DEFAULT_LANG` VARCHAR(10) default '', - PRIMARY KEY (`USR_UID`) + PRIMARY KEY (`USR_UID`), + KEY `indexUsrUid` (`USR_UID`) )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Users'; #----------------------------------------------------------------------------- #-- APP_THREAD @@ -1194,6 +1196,10 @@ CREATE TABLE `APP_CACHE_VIEW` `APP_UPDATE_DATE` DATETIME NOT NULL, `APP_OVERDUE_PERCENTAGE` DOUBLE NOT NULL, PRIMARY KEY (`APP_UID`,`DEL_INDEX`), + KEY `indexAppUid`(`APP_UID`), + KEY `indexTasUid`(`TAS_UID`), + KEY `indexUsrUid`(`USR_UID`), + KEY `indexPrevUsrUid`(`PREVIOUS_USR_UID`), KEY `indexProUid`(`PRO_UID`), KEY `indexAppNumber`(`APP_NUMBER`), KEY `protitle`(`APP_PRO_TITLE`), From b6d02ed7d9db47edc99367b67fc0ba9977e3afe7 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 1 Apr 2016 18:49:13 -0400 Subject: [PATCH 2/6] HOR-646-3018 "Public Files>AL cargar..." SOLVED --- workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php b/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php index 87b20d3d9..9fdae54ac 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php @@ -85,7 +85,7 @@ class FilesManager } foreach ($aFiles as $aFile) { $arrayFileUid = $this->getFileManagerUid($sDirectory.$aFile['FILE']); - $fcontent = file_get_contents($sDirectory.$aFile['FILE']); + $fcontent = ''; $fileUid = $arrayFileUid["PRF_UID"]; if ($fileUid != null) { $oProcessFiles = \ProcessFilesPeer::retrieveByPK($fileUid); From 2fcc9146f5045f736f43d6cfb794eef525916122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Fri, 1 Apr 2016 19:23:28 -0400 Subject: [PATCH 3/6] HOR-678 --- .../ProcessMaker/BusinessModel/Light/NotificationDevice.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php index 88c32255a..d8dba4655 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php @@ -2,6 +2,7 @@ namespace ProcessMaker\BusinessModel\Light; +use \ProcessMaker\Services\Api; use G; class NotificationDevice @@ -135,7 +136,7 @@ class NotificationDevice } } catch (\Exception $e) { - throw new \Exception(\Api::STAT_APP_EXCEPTION, $e->getMessage()); + throw new \Exception(Api::STAT_APP_EXCEPTION, $e->getMessage()); } return $response; } @@ -229,7 +230,7 @@ class NotificationDevice } } } catch (\Exception $e) { - throw new \Exception(\Api::STAT_APP_EXCEPTION, $e->getMessage()); + throw new \Exception(Api::STAT_APP_EXCEPTION, $e->getMessage()); } return $response; } From 67c72aea6339e4d0748afb907e65a2355bb7f049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Mon, 4 Apr 2016 10:33:51 -0400 Subject: [PATCH 4/6] HOR-678 --- .../ProcessMaker/BusinessModel/Light/NotificationDevice.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php index d8dba4655..78288ed19 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php @@ -136,7 +136,7 @@ class NotificationDevice } } catch (\Exception $e) { - throw new \Exception(Api::STAT_APP_EXCEPTION, $e->getMessage()); + throw new \Exception($e->getMessage(), Api::STAT_APP_EXCEPTION); } return $response; } @@ -230,7 +230,7 @@ class NotificationDevice } } } catch (\Exception $e) { - throw new \Exception(Api::STAT_APP_EXCEPTION, $e->getMessage()); + throw new \Exception($e->getMessage(), Api::STAT_APP_EXCEPTION); } return $response; } From afb17535c51233ae580545a4897396515cc16a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Mon, 4 Apr 2016 10:36:13 -0400 Subject: [PATCH 5/6] HOR-678 --- .../src/ProcessMaker/BusinessModel/Light/NotificationDevice.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php index 78288ed19..ecab8dcbd 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php @@ -138,6 +138,7 @@ class NotificationDevice } catch (\Exception $e) { throw new \Exception($e->getMessage(), Api::STAT_APP_EXCEPTION); } + return $response; } @@ -232,6 +233,7 @@ class NotificationDevice } catch (\Exception $e) { throw new \Exception($e->getMessage(), Api::STAT_APP_EXCEPTION); } + return $response; } From 125c9507a4be4c23c51b8ee1d3a00a210d21b888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Mon, 4 Apr 2016 10:41:44 -0400 Subject: [PATCH 6/6] HOR-678 --- .../ProcessMaker/BusinessModel/Light/NotificationDevice.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php index ecab8dcbd..5f370b989 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php @@ -138,7 +138,6 @@ class NotificationDevice } catch (\Exception $e) { throw new \Exception($e->getMessage(), Api::STAT_APP_EXCEPTION); } - return $response; } @@ -233,7 +232,7 @@ class NotificationDevice } catch (\Exception $e) { throw new \Exception($e->getMessage(), Api::STAT_APP_EXCEPTION); } - + return $response; }