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

Merge branch 'master' of bitbucket.org:colosa/processmaker into CONSOLIDATED

Browse Source
This commit is contained in:
Brayan Pereyra
2015-03-25 18:20:07 -04:00
parent 1096a75fd8 beb2a15107
commit c801d0d38f
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,6 +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"]);
} }
if (isset($aData["DYN_LABEL"])) {
$this->setDynLabel($aData["DYN_LABEL"]);
}
if (!isset($aData['DYN_VERSION'])) { if (!isset($aData['DYN_VERSION'])) {
$aData['DYN_VERSION'] = 0; $aData['DYN_VERSION'] = 0;
} }

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

@@ -1195,13 +1195,13 @@ class DynaForm
$dynaForm = new \Dynaform(); $dynaForm = new \Dynaform();
$arraydata = $dynaForm->Load($dynaFormUid); $arraydata = $dynaForm->Load($dynaFormUid);
if ($arraydata["DYN_LABEL"] !== null && $arraydata["DYN_LABEL"] !== "") { if ($arraydata["DYN_LABEL"] !== null && $arraydata["DYN_LABEL"] !== "") {
$dyn_labels = \G::json_decode($arraydata["DYN_LABEL"]); $dyn_labels = \G::json_decode($arraydata["DYN_LABEL"]);
$dyn_labels->$name[count($name) - 2] = $content;
} else { } else {
$dyn_labels = array(); $dyn_labels = new \stdClass();
} }
$dyn_labels->$name[count($name) - 2] = $content;
$arraydata["DYN_LABEL"] = \G::json_encode($dyn_labels); $arraydata["DYN_LABEL"] = \G::json_encode($dyn_labels);
$dynaForm->update($arraydata); $dynaForm->update($arraydata);
@@ -1225,11 +1225,13 @@ class DynaForm
public function listLanguage($projectUid, $dynaFormUid) public function listLanguage($projectUid, $dynaFormUid)
{ {
try { try {
$list = array();
$dynaForm = new \Dynaform(); $dynaForm = new \Dynaform();
$arraydata = $dynaForm->Load($dynaFormUid); $arraydata = $dynaForm->Load($dynaFormUid);
if ($arraydata["DYN_LABEL"] === null || $arraydata["DYN_LABEL"] === "")
return $list;
$dyn_labels = \G::json_decode($arraydata["DYN_LABEL"]); $dyn_labels = \G::json_decode($arraydata["DYN_LABEL"]);
$list = array();
foreach ($dyn_labels as $key => $value) { foreach ($dyn_labels as $key => $value) {
array_push($list, array( array_push($list, array(
"Lang" => $key, "Lang" => $key,
@@ -1267,8 +1269,10 @@ class DynaForm
try { try {
$dynaForm = new \Dynaform(); $dynaForm = new \Dynaform();
$arraydata = $dynaForm->Load($dynaFormUid); $arraydata = $dynaForm->Load($dynaFormUid);
$json = \G::json_decode($arraydata["DYN_CONTENT"]); if ($arraydata["DYN_CONTENT"] !== null && $arraydata["DYN_CONTENT"] !== "") {
$this->jsonr($json); $json = \G::json_decode($arraydata["DYN_CONTENT"]);
$this->jsonr($json);
}
$string = ""; $string = "";
$string = $string . "msgid \"\"\n"; $string = $string . "msgid \"\"\n";
$string = $string . "msgstr \"\"\n"; $string = $string . "msgstr \"\"\n";