From 8c7d9f6044a5bb2ae2d41315dde8a1db9ad81c63 Mon Sep 17 00:00:00 2001
From: William Barra <dheeyi@gmail.com>
Date: Thu, 2 Jun 2016 14:29:19 -0400
Subject: [PATCH 1/2] =?UTF-8?q?HOR-1087=20HOR-1087=20Se=20requiere=20la=20?=
 =?UTF-8?q?creaci=C3=B3n=20la=20variable=20global=20isRTL=20y=20phatRTLCss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 workflow/engine/classes/class.pmDynaform.php | 22 ++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php
index 6026948c3..b04320ad2 100644
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -19,9 +19,15 @@ class pmDynaform
     public $langs = null;
     public $displayMode = null;
     public $onPropertyRead = "onPropertyReadFormInstance";
+    public $isRTL = false;
+    public $pathRTLCss = '';
+    public $serverConf = null;
 
     public function __construct($fields = array())
     {
+        $this->pathRTLCss = '/lib/pmdynaform/build/css/PMDynaform-rtl.css';
+        $this->serverConf = &serverConf::getSingleton();
+        $this->isRTL = ($this->serverConf->isRtl(SYS_LANG)) ? 'true' : 'false';
         $this->fields = $fields;
         $this->getDynaform();
         $this->getDynaforms();
@@ -670,6 +676,8 @@ class pmDynaform
                 var fieldsRequired = null;
                 var triggerDebug = false;
                 var sysLang = \"" . SYS_LANG . "\";
+                var isRTL = \"" . $this->isRTL . "\";
+                var pathRTLCss = \"" . $this->pathRTLCss . "\";
                 $(window).load(function ()
                 {
                     var data = jsondata;
@@ -726,6 +734,8 @@ class pmDynaform
                 "var fieldsRequired = null;\n" .
                 "var triggerDebug = null;\n" .
                 "var sysLang = '" . SYS_LANG . "';\n" .
+                "var isRTL = " . $this->isRTL . ";\n" .
+                "var pathRTLCss = '" . $this->pathRTLCss . "';\n" .
                 "$(window).load(function () {\n" .
                 "    var data = jsondata;\n" .
                 "    window.dynaform = new PMDynaform.core.Project({\n" .
@@ -799,6 +809,8 @@ class pmDynaform
                 "var fieldsRequired = null;\n" .
                 "var triggerDebug = " . ($this->fields["TRIGGER_DEBUG"] === 1 ? "true" : "false") . ";\n" .
                 "var sysLang = '" . SYS_LANG . "';\n" .
+                "var isRTL = " . $this->isRTL . ";\n" .
+                "var pathRTLCss = '" . $this->pathRTLCss . "';\n" .
                 "</script>\n" .
                 "<script type='text/javascript' src='/jscore/cases/core/cases_Step.js'></script>\n" .
                 "<script type='text/javascript' src='/jscore/cases/core/pmDynaform.js'></script>\n" .
@@ -852,6 +864,8 @@ class pmDynaform
             var fieldsRequired = null;
             var triggerDebug   = null;
             var sysLang = \"" . SYS_LANG . "\";
+            var isRTL = \"" . $this->isRTL . "\";
+            var pathRTLCss = \"" . $this->pathRTLCss . "\";
         </script>
 
         <script type=\"text/javascript\" src=\"/jscore/cases/core/pmDynaform.js\"></script>
@@ -892,6 +906,8 @@ class pmDynaform
                 "var fieldsRequired = " . G::json_encode(array()) . ";\n" .
                 "var triggerDebug = null;\n" .
                 "var sysLang = '" . SYS_LANG . "';\n" .
+                "var isRTL = " . $this->isRTL . ";\n" .
+                "var pathRTLCss = '" . $this->pathRTLCss . "';\n" .
                 "</script>\n" .
                 "<script type='text/javascript' src='/jscore/cases/core/pmDynaform.js'></script>\n" .
                 "<div style='width:100%;padding: 0px 10px 0px 10px;margin:15px 0px 0px 0px;'>\n" .
@@ -930,6 +946,8 @@ class pmDynaform
                 "var fieldsRequired = " . G::json_encode(array()) . ";\n" .
                 "var triggerDebug = null;\n" .
                 "var sysLang = '" . SYS_LANG . "';\n" .
+                "var isRTL = " . $this->isRTL . ";\n" .
+                "var pathRTLCss = '" . $this->pathRTLCss . "';\n" .
                 "</script>\n" .
                 "<script type='text/javascript' src='/jscore/cases/core/pmDynaform.js'></script>\n" .
                 "<div style='width:100%;padding: 0px 10px 0px 10px;margin:15px 0px 0px 0px;'>\n" .
@@ -951,6 +969,8 @@ class pmDynaform
         $javascrip = "" .
                 "<script type='text/javascript'>" .
                 "var sysLang = '" . SYS_LANG . "';\n" .
+                "var isRTL = " . $this->isRTL . ";\n" .
+                "var pathRTLCss = '" . $this->pathRTLCss . "';\n" .
                 "var jsonData = " . G::json_encode($json) . ";\n" .
                 "var httpServerHostname = \"" . System::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 $js .
@@ -985,6 +1005,8 @@ class pmDynaform
                 "var fieldsRequired = " . G::json_encode(array()) . ";\n" .
                 "var triggerDebug = null;\n" .
                 "var sysLang = '" . SYS_LANG . "';\n" .
+                "var isRTL = " . $this->isRTL . ";\n" .
+                "var pathRTLCss = '" . $this->pathRTLCss . "';\n" .
                 "</script>\n" .
                 "<script type='text/javascript' src='/jscore/cases/core/pmDynaform.js'></script>\n" .
                 "<div style='width:100%;padding: 0px 10px 0px 10px;margin:15px 0px 0px 0px;'>\n" .

From a4c3a5cdc7fa8a27191a6d217a473bda06d8de13 Mon Sep 17 00:00:00 2001
From: Dheeyi William <dheeyi@gmail.com>
Date: Tue, 7 Jun 2016 12:29:08 -0400
Subject: [PATCH 2/2] HOR-1056 Pausing a parallel task in a subprocess causes a
 serious misbehavior

---
 workflow/engine/classes/class.derivation.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php
index e93693443..e2cc65b2c 100755
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -1341,15 +1341,21 @@ class Derivation
         /* Start Block : Count the open threads of $currentDelegation['APP_UID'] */
         $openThreads = $this->case->GetOpenThreads( $currentDelegation['APP_UID'] );
 
-        ///////
         $flag = false;
 
-        if ($openThreads == 0) {
+        //check if there is any paused thread
+        $existThareadPause = false;
+        if (isset($arraySiblings['pause'])) {
+            if (!empty($arraySiblings['pause'])) {
+                $existThareadPause = true;
+            }
+        }
+
+        if ($openThreads == 0 && !$existThareadPause) {
             //Close case
             $appFields["APP_STATUS"] = "COMPLETED";
             $appFields["APP_FINISH_DATE"] = "now";
             $this->verifyIsCaseChild($currentDelegation["APP_UID"], $currentDelegation["DEL_INDEX"]);
-
             $flag = true;
         }