diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index 0697ea658..396899e9e 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -51,13 +51,15 @@ class pmDynaform $dr = $dt[$i]; $n2 = count($dr); for ($j = 0; $j < $n2; $j++) { - if ($dr[$j]->name) { + if (isset($dr[$j]->name)) { $valueField = isset($this->app_data[$dr[$j]->name]) ? $this->app_data[$dr[$j]->name] : ""; $dataJSON->items[0]->items[$i][$j]->defaultValue = $valueField; } } } - return G::json_encode($dataJSON); + $a = G::json_encode($dataJSON); + $a = str_replace("\/", "/", $a); + return $a; } public function mergeValues() diff --git a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js b/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js index f71514322..c2f53a510 100644 --- a/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js +++ b/workflow/engine/js/cases/core/cases_Step_Pmdynaform.js @@ -54,8 +54,8 @@ $(window).load(function () { for (var j = 0; j < dr.length; j++) { if (dr[j].name) { el[k].name = "form[" + dr[j].name + "]"; - k = k + 1; } + k = k + 1; } } diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php index 6838959f4..cceccf10c 100644 --- a/workflow/engine/methods/cases/cases_SaveData.php +++ b/workflow/engine/methods/cases/cases_SaveData.php @@ -186,6 +186,7 @@ try { if ($swpmdynaform) { $aData['APP_DATA'] = array_merge($aData['APP_DATA'], $pmdynaform); + $_POST["DynaformRequiredFields"] = '[]'; } $oCase->updateCase( $_SESSION['APPLICATION'], $aData ); @@ -280,13 +281,13 @@ try { $oFolder = new AppFolder(); //***Validating the file allowed extensions*** - $res = G::verifyInputDocExtension($aID['INP_DOC_TYPE_FILE'], $_FILES["form"]["name"]["input"], $_FILES["form"]["tmp_name"]["input"]); - if($res->status == 0){ - $message = $res->message; - G::SendMessageText( $message, "ERROR" ); - $backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] ); - G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] ); - die(); + $res = G::verifyInputDocExtension($aID['INP_DOC_TYPE_FILE'], $_FILES["form"]["name"]["input"], $_FILES["form"]["tmp_name"]["input"]); + if($res->status == 0){ + $message = $res->message; + G::SendMessageText( $message, "ERROR" ); + $backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] ); + G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] ); + die(); } $aFields = array ("APP_UID" => $_SESSION["APPLICATION"],"DEL_INDEX" => $_SESSION["INDEX"],"USR_UID" => $_SESSION["USER_LOGGED"],"DOC_UID" => $indocUid,"APP_DOC_TYPE" => "INPUT","APP_DOC_CREATE_DATE" => date( "Y-m-d H:i:s" ),"APP_DOC_COMMENT" => "","APP_DOC_TITLE" => "","APP_DOC_FILENAME" => $arrayFileName[$i],"FOLDER_UID" => $oFolder->createFromPath( $aID["INP_DOC_DESTINATION_PATH"] ),"APP_DOC_TAGS" => $oFolder->parseTags( $aID["INP_DOC_TAGS"] ),"APP_DOC_FIELDNAME" => $fieldName);