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

Merged in darojas/processmaker (pull request #190)

Browse Source 
Se adiciona BEHAT para FILES MANAGER. Se arreglos en FILES MANAGER. Fix limit en PM USER.
This commit is contained in:
erik ao
2014-02-13 16:23:08 -04:00
parent e92fffe6e9 5a8d9b837d
commit 20d2511e9e
5 changed files with 106 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
workflow/engine/src/BusinessModel/FilesManager.php
View File

@@ -54,7 +54,7 @@ class FilesManager
case 'templates':
$sDirectory = PATH_DATA_MAILTEMPLATES . $sProcessUID . PATH_SEP . $sSubDirectory;
break;
case 'folder':
case 'public':
$sDirectory = PATH_DATA_PUBLIC . $sProcessUID . PATH_SEP . $sSubDirectory;
break;
default:
@@ -115,8 +115,8 @@ class FilesManager
try {
$aData['path'] = rtrim($aData['path'], '/') . '/';
$sMainDirectory = current(explode("/", $aData['path']));
if ($sMainDirectory != 'folder' && $sMainDirectory != 'templates') {
throw (new \Exception( 'invalid value specified for `prf_path`. Expecting `templates/` or `folder/`'));
if ($sMainDirectory != 'public' && $sMainDirectory != 'templates') {
throw (new \Exception( 'invalid value specified for `prf_path`. Expecting `templates/` or `public/`'));
}
if(strstr($aData['path'],'/')){
$sSubDirectory = substr($aData['path'], strpos($aData['path'], "/")+1) ;
@@ -129,7 +129,7 @@ class FilesManager
$sCheckDirectory = PATH_DATA_MAILTEMPLATES . $sProcessUID . PATH_SEP . $sSubDirectory;
$sEditable = false;
break;
case 'folder':
case 'public':
$sDirectory = PATH_DATA_PUBLIC . $sProcessUID . PATH_SEP . $sSubDirectory . $aData['file_name'];
$sCheckDirectory = PATH_DATA_PUBLIC . $sProcessUID . PATH_SEP . $sSubDirectory;
break;
@@ -235,8 +235,8 @@ class FilesManager
try {
$path = rtrim($path, '/') . '/';
$sMainDirectory = current(explode("/", $path));
if ($sMainDirectory != 'folder' && $sMainDirectory != 'templates') {
throw (new \Exception( 'invalid value specified for `prf_path`. Expecting `templates/` or `folder/`'));
if ($sMainDirectory != 'public' && $sMainDirectory != 'templates') {
throw (new \Exception( 'invalid value specified for `prf_path`. Expecting `templates/` or `public/`'));
}
if(strstr($path,'/')){
$sSubDirectory = substr($path, strpos($path, "/")+1) ;
@@ -248,7 +248,7 @@ class FilesManager
$sDirectory = PATH_DATA_MAILTEMPLATES . $sProcessUID . PATH_SEP . $sSubDirectory . $aData['file_name'];
$sEditable = false;
break;
case 'folder':
case 'public':
$sDirectory = PATH_DATA_PUBLIC . $sProcessUID . PATH_SEP . $sSubDirectory . $aData['file_name'];
break;
default:
@@ -309,12 +309,10 @@ class FilesManager
{
try {
$sMainDirectory = current(explode("/", $path));
if ($sMainDirectory != 'folder' && $sMainDirectory != 'templates') {
throw (new \Exception( 'invalid value specified for `prf_path`. Expecting `templates/` or `folder/`'));
if ($sMainDirectory != 'public' && $sMainDirectory != 'templates') {
throw (new \Exception( 'invalid value specified for `prf_path`. Expecting `templates/` or `public/`'));
}
if ($sMainDirectory == 'folder') {
$sMainDirectory = 'public';
} else {
if ($sMainDirectory == 'templates') {
$sMainDirectory = 'mailTemplates';
}
$sfile = end(explode("/",$path));
@@ -367,12 +365,10 @@ class FilesManager
{
try {
$sMainDirectory = current(explode("/", $path));
if ($sMainDirectory != 'folder' && $sMainDirectory != 'templates') {
throw (new \Exception( 'invalid value specified for `prf_path`. Expecting `templates/` or `folder/`'));
if ($sMainDirectory != 'public' && $sMainDirectory != 'templates') {
throw (new \Exception( 'invalid value specified for `prf_path`. Expecting `templates/` or `public/`'));
}
if ($sMainDirectory == 'folder') {
$sMainDirectory = 'public';
} else {
if ($sMainDirectory == 'templates') {
$sMainDirectory = 'mailTemplates';
}
$sfile = end(explode("/",$path));

8
workflow/engine/src/BusinessModel/User.php
View File

@@ -661,17 +661,17 @@ class User
if ($start < 0) {
throw (new \Exception( 'invalid value specified for `start`.'));
} else {
$oCriteria->setOffset( $start );
$oCriteria->setOffset($start);
}
}
if (isset($limit)) {
if ($limit != '') {
if ($limit < 0) {
throw (new \Exception( 'invalid value specified for `limit`.'));
} else {
if ($limit == 0) {
return $aUsers;
return $aUserInfo;
} else {
$oCriteria->setLimit( $limit );
$oCriteria->setLimit($limit);
}
}
}

4
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)
{
@@ -124,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();

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()));