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

Merged in qronald/processmaker (pull request #2067)

Browse Source 
Fix in Restler malformed json is valid in class JsonFormat and not valid in other class
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-30 21:01:28 -04:00
parent 971039e083 9800e71a8c
commit d487089339
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -886,11 +886,11 @@ class Light extends Api
$dataList['dateTo'] = $date_to;
$dataList['search'] = $search;
$usr_uid = $this->getUserId();
$cases = new \ProcessMaker\BusinessModel\Cases();
$response = $cases->getCaseNotes($app_uid, $usr_uid, $dataList);
$result = $this->parserDataNotes($response['data']);
return $result;
$appNotes = new \AppNotes();
$response = $appNotes->getNotesList( $app_uid, '', $start, $limit );
$response = $this->parserDataNotes($response['array']['notes']);
return $response;
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
}
@@ -899,11 +899,17 @@ class Light extends Api
public function parserDataNotes ($data)
{
$structure = array(
'app_uid' => 'caseId',
'usr_uid' => 'userId',
'APP_UID' => 'caseId',
'notes' => array(
'note_date' => 'date',
'note_content' => 'content'
'NOTE_DATE' => 'date',
'NOTE_CONTENT' => 'content'
),
'user' => array(
'USR_UID' => 'userId',
'USR_USERNAME' => 'name',
'USR_FIRSTNAME' => 'fristName',
'USR_LASTNAME' => 'lastName',
'USR_EMAIL' => 'email'
)
);