fernando/luos
1
0
Fork 0
Code Releases Activity

fix in name

Browse Source
This commit is contained in:
qronald
2017-04-21 15:12:34 -04:00
parent 68d6281cc8
commit 8b8b562c96
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/src/ProcessMaker/Services/Api/Project.php
View File

@@ -58,9 +58,9 @@ class Project extends Api
$project = Adapter\BpmnWorkflow::getStruct($prj_uid); $project = Adapter\BpmnWorkflow::getStruct($prj_uid);
$oUserProperty = (new \UsersProperties)->load($this->getUserId()); $oUserProperty = (new \UsersProperties)->load($this->getUserId());
$project['user_setting_designer'] = null; $project['usr_setting_designer'] = null;
if (!$oUserProperty['USR_SETTING_DESIGNER'] && $oUserProperty['USR_SETTING_DESIGNER']) { if ($oUserProperty['USR_SETTING_DESIGNER']) {
$project['user_setting_designer'] = unserialize($oUserProperty['USR_SETTING_DESIGNER']); $project['usr_setting_designer'] = json_decode($oUserProperty['USR_SETTING_DESIGNER']);
} }
return DateTime::convertUtcToIso8601($project, $this->arrayFieldIso8601); return DateTime::convertUtcToIso8601($project, $this->arrayFieldIso8601);
} catch (\Exception $e) { } catch (\Exception $e) {
@@ -101,18 +101,19 @@ class Project extends Api
public function doPutProject($prj_uid, $request_data) public function doPutProject($prj_uid, $request_data)
{ {
try { try {
if (array_key_exists('user_setting_designer', $request_data)) { if (array_key_exists('usr_setting_designer', $request_data)) {
$oUserProperty = \UsersPropertiesPeer::retrieveByPK($this->getUserId()); $oUserProperty = \UsersPropertiesPeer::retrieveByPK($this->getUserId());
if ($oUserProperty) { if ($oUserProperty) {
$oUserProperty->fromArray($request_data, \BasePeer::TYPE_FIELDNAME); $data['USR_SETTING_DESIGNER'] = json_encode($request_data['usr_setting_designer']);
$oUserProperty->fromArray($data, \BasePeer::TYPE_FIELDNAME);
$oUserProperty->save(); $oUserProperty->save();
} else { } else {
$oUserProperty = new \UsersProperties(); $oUserProperty = new \UsersProperties();
$oUserProperty->setUsrUid($this->getUserId()); $oUserProperty->setUsrUid($this->getUserId());
$oUserProperty->setUsrSettingDesigner(serialize($request_data['user_setting_designer'])); $oUserProperty->setUsrSettingDesigner(serialize($request_data['usr_setting_designer']));
$oUserProperty->save(); $oUserProperty->save();
} }
unset($request_data['user_setting_designer']); unset($request_data['usr_setting_designer']);
} }
Validator::throwExceptionIfDataNotMetIso8601Format($request_data, $this->arrayFieldIso8601); Validator::throwExceptionIfDataNotMetIso8601Format($request_data, $this->arrayFieldIso8601);