diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 4b092365d..d545c07f6 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -1341,10 +1341,10 @@ class Derivation /* Start Block : Count the open threads of $currentDelegation['APP_UID'] */ $openThreads = $this->case->GetOpenThreads( $currentDelegation['APP_UID'] ); - /////// $flag = false; //check if there is any paused thread + $existThreadPaused = false; if (isset($arraySiblings['pause'])) { if (!empty($arraySiblings['pause'])) { 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" . "\n" . "\n" . "\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 . "\"; @@ -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" . "\n" . "\n" . "