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

Fix Dynaform en el campo dyn_version

Browse Source
This commit is contained in:
Daniel Rojas
2014-07-01 09:36:57 -04:00
parent e2751ab73e
commit 0f159a4265
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/model/Dynaform.php
View File

@@ -173,7 +173,9 @@ class Dynaform extends BaseDynaform
if (isset($aData["DYN_CONTENT"])) { if (isset($aData["DYN_CONTENT"])) {
$this->setDynContent($aData["DYN_CONTENT"]); $this->setDynContent($aData["DYN_CONTENT"]);
} }
$this->setDynVersion( $aData['DYN_VERSION'] ); if (isset($aData["DYN_VERSION"])) {
$this->setDynVersion( $aData['DYN_VERSION'] );
}
if ($this->validate()) { if ($this->validate()) {
$con->begin(); $con->begin();
$res = $this->save(); $res = $this->save();

8
workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php
View File

@@ -365,6 +365,10 @@ class DynaForm
//Create //Create
$dynaForm = new \Dynaform(); $dynaForm = new \Dynaform();
if (isset($arrayData["DYN_VERSION"])) {
$arrayData["DYN_VERSION"] = 1;
}
$arrayData["PRO_UID"] = $processUid; $arrayData["PRO_UID"] = $processUid;
$dynaFormUid = $dynaForm->create($arrayData); $dynaFormUid = $dynaForm->create($arrayData);
@@ -953,6 +957,10 @@ class DynaForm
$record["DYN_DESCRIPTION"] = \Content::load("DYN_DESCRIPTION", "", $record["DYN_UID"], SYS_LANG); $record["DYN_DESCRIPTION"] = \Content::load("DYN_DESCRIPTION", "", $record["DYN_UID"], SYS_LANG);
} }
if ($record["DYN_VERSION"] == 0) {
$record["DYN_VERSION"] = 1;
}
return array( return array(
$this->getFieldNameByFormatFieldName("DYN_UID") => $record["DYN_UID"], $this->getFieldNameByFormatFieldName("DYN_UID") => $record["DYN_UID"],
$this->getFieldNameByFormatFieldName("DYN_TITLE") => $record["DYN_TITLE"], $this->getFieldNameByFormatFieldName("DYN_TITLE") => $record["DYN_TITLE"],