fernando/luos
1
0
Fork 0
Code Releases Activity

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

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-02-13 16:29:08 -04:00
parent c9066e0d75 20d2511e9e
commit 636f000717
315 changed files with 18160 additions and 16348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ class FilesManager extends Api
/**
* @param string $prjUid {@min 32} {@max 32}
*
* @url POST /:prjUid/process-file-manager-upload
* @url POST /:prjUid/process-file-manager/upload
*/
public function doPostProcessFilesManagerUpload($prjUid)
{
@@ -80,12 +80,12 @@ class FilesManager extends Api
/**
* @param string $prjUid {@min 32} {@max 32}
* @param ProcessFilesManagerStructurePut $request_data
* @param string $path
* @param ProcessFilesManagerStructure1 $request_data
*
* @url PUT /:prjUid/process-file-manager1
* @url PUT /:prjUid/process-file-manager
*/
public function doPutProcessFilesManager($prjUid, ProcessFilesManagerStructure1 $request_data, $path)
public function doPutProcessFilesManager($prjUid, ProcessFilesManagerStructurePut $request_data, $path)
{
try {
$userUid = $this->getUserId();
@@ -116,7 +116,6 @@ class FilesManager extends Api
//response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
return $response;
}
/**
@@ -125,7 +124,7 @@ class FilesManager extends Api
*
* @url GET /:prjUid/process-file-manager/download
*/
public function doDownloadProcessFilesManager($prjUid, $path)
public function doGetProcessFilesManagerDownload($prjUid, $path)
{
try {
$filesManager = new \BusinessModel\FilesManager();
@@ -155,7 +154,8 @@ class ProcessFilesManagerStructure
public $content;
}
class ProcessFilesManagerStructure1
class ProcessFilesManagerStructurePut
{
/**
* @var string {@from body}
@@ -166,4 +166,5 @@ class ProcessFilesManagerStructure1
* @var string {@from body}
*/
public $content;
}
}

2
workflow/engine/src/Services/Api/ProcessMaker/User.php
View File

@@ -18,7 +18,7 @@ class User extends Api
{
try {
$user = new \BusinessModel\User();
$response = $user->getUsers($filter, null, null, $start, $limit);
$response = $user->getUsers($filter, $start, $limit);
return $response;
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));