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

This commit is contained in:
Freddy Daniel Rojas Valda
2013-12-09 10:38:20 -04:00
2 changed files with 2 additions and 1 deletions

View File

@@ -43,7 +43,7 @@ class Project extends Api
$project = BpmnModel::loadProject($prjUid);
//$WorkflowProces = \ProcessMaker\Adapter\Workflow::loadFromBpmnProject($project);
//return $WorkflowProces;
return $project;
} catch (\Exception $e) {
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());

View File

@@ -17,6 +17,7 @@ debug = 1
step = "Services\Api\ProcessMaker\Project\Activity\Step"
assignee = "Services\Api\ProcessMaker\Project\Activity\Assignee"
trigger = "Services\Api\ProcessMaker\Project\Activity\Step\Trigger"
project = "Services\Api\ProcessMaker\Project"
[alias: projects]
project = "Services\Api\ProcessMaker\Project"