diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 30b982e4e..e9e76ec53 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -3877,8 +3877,12 @@ class Cases $oCriteria->add(AppThreadPeer::DEL_INDEX, $iDelegation); $oDataset = AppThreadPeer::doSelectRS($oCriteria); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $oDataset->next(); - $aRow = $oDataset->getRow(); + + if ($oDataset->next()) { + $aRow = $oDataset->getRow(); + } else { + throw new Exception(G::LoadTranslation("ID_CASE_STOPPED_TRIGGER")); + } //now create a row in APP_DELAY with type PAUSE $aData['PRO_UID'] = $aFields['PRO_UID']; diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index bc00723d5..8e640d494 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -244,13 +244,19 @@ Ext.onReady(function(){ var dynaformChange =""; var swDynaformChange = 0; - if (window.frames["openCaseFrame"].document.getElementsByTagName("form")) { - dynaformChange = window.frames["openCaseFrame"].document.getElementsByTagName("form").item(0); - swDynaformChange = (window.frames["openCaseFrame"].dynaFormChanged(dynaformChange))? 1 : 0; + var iframeDynaForm = (typeof(window.frames["openCaseFrame"].document) != "undefined")? window.frames["openCaseFrame"].document : ((typeof(window.frames["openCaseFrame"].contentDocument) != "undefined")? window.frames["openCaseFrame"].contentDocument : window.frames["openCaseFrame"].contentWindow.document); + + if (iframeDynaForm.getElementsByTagName("form")) { + dynaformChange = iframeDynaForm.getElementsByTagName("form").item(0); + + if (typeof(window.frames["openCaseFrame"].dynaFormChanged) == "function") { + swDynaformChange = (window.frames["openCaseFrame"].dynaFormChanged(dynaformChange))? 1 : 0; + } } - if (window.frames["openCaseFrame"].document.getElementById("DynaformRequiredFields")) { - requiredField = window.frames["openCaseFrame"].document.getElementById("DynaformRequiredFields").value; + if (iframeDynaForm.getElementById("DynaformRequiredFields")) { + requiredField = iframeDynaForm.getElementById("DynaformRequiredFields").value; + if (requiredField != "") { swRequiredField = (window.frames["openCaseFrame"].validateForm(requiredField))? 1 : 0; } @@ -268,7 +274,7 @@ Ext.onReady(function(){ loadMaskStep.show(); if (btn == "ok") { - var frm = window.frames["openCaseFrame"].document.getElementsByTagName("form"); + var frm = iframeDynaForm.getElementsByTagName("form"); if (frm.length > 0) { var result = window.frames["openCaseFrame"].ajax_post(