fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in gproly/processmaker (pull request #774)

Browse Source 
BUG-15666 Dynaform data is not correctly stored/display in dynaforms APP_DATA. SOLVED.
This commit is contained in:
Julio Cesar Laura Avendaño
2014-09-11 11:51:15 -04:00
parent dfc3693943 0d187ca304
commit aa534f573c
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/class.pmDynaform.php
View File

@@ -51,13 +51,15 @@ class pmDynaform
$dr = $dt[$i]; $dr = $dt[$i];
$n2 = count($dr); $n2 = count($dr);
for ($j = 0; $j < $n2; $j++) { 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] : ""; $valueField = isset($this->app_data[$dr[$j]->name]) ? $this->app_data[$dr[$j]->name] : "";
$dataJSON->items[0]->items[$i][$j]->defaultValue = $valueField; $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() public function mergeValues()

2
workflow/engine/js/cases/core/cases_Step_Pmdynaform.js
View File

@@ -54,8 +54,8 @@ $(window).load(function () {
for (var j = 0; j < dr.length; j++) { for (var j = 0; j < dr.length; j++) {
if (dr[j].name) { if (dr[j].name) {
el[k].name = "form[" + dr[j].name + "]"; el[k].name = "form[" + dr[j].name + "]";
k = k + 1;
} }
k = k + 1;
} }
} }

15
workflow/engine/methods/cases/cases_SaveData.php
View File

@@ -186,6 +186,7 @@ try {
if ($swpmdynaform) { if ($swpmdynaform) {
$aData['APP_DATA'] = array_merge($aData['APP_DATA'], $pmdynaform); $aData['APP_DATA'] = array_merge($aData['APP_DATA'], $pmdynaform);
$_POST["DynaformRequiredFields"] = '[]';
} }
$oCase->updateCase( $_SESSION['APPLICATION'], $aData ); $oCase->updateCase( $_SESSION['APPLICATION'], $aData );
@@ -280,13 +281,13 @@ try {
$oFolder = new AppFolder(); $oFolder = new AppFolder();
//***Validating the file allowed extensions*** //***Validating the file allowed extensions***
$res = G::verifyInputDocExtension($aID['INP_DOC_TYPE_FILE'], $_FILES["form"]["name"]["input"], $_FILES["form"]["tmp_name"]["input"]); $res = G::verifyInputDocExtension($aID['INP_DOC_TYPE_FILE'], $_FILES["form"]["name"]["input"], $_FILES["form"]["tmp_name"]["input"]);
if($res->status == 0){ if($res->status == 0){
$message = $res->message; $message = $res->message;
G::SendMessageText( $message, "ERROR" ); G::SendMessageText( $message, "ERROR" );
$backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] ); $backUrlObj = explode( "sys" . SYS_SYS, $_SERVER['HTTP_REFERER'] );
G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] ); G::header( "location: " . "/sys" . SYS_SYS . $backUrlObj[1] );
die(); 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); $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);