fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in victorsl/processmaker (pull request #546)

Browse Source 
ProcessMaker-BE "Trigger Wizard (fixes)"
This commit is contained in:
Erik Amaru Ortiz
2014-06-23 10:30:22 -04:00
parent ddb6e08294 82071586c2
commit 97e82ef938
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/src/ProcessMaker/BusinessModel/InputDocument.php
View File

@@ -10,7 +10,7 @@ class InputDocument
"INP_DOC_DESCRIPTION" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "inputDocumentDescription"),
"INP_DOC_FORM_NEEDED" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array("VIRTUAL", "REAL", "VREAL"), "fieldNameAux" => "inputDocumentFormNeeded"),
"INP_DOC_ORIGINAL" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array("ORIGINAL", "COPY", "COPYLEGAL"), "fieldNameAux" => "inputDocumentOriginal"),
"INP_DOC_PUBLISHED" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array("PRIVATE"), "fieldNameAux" => "inputDocumentPublished"),
"INP_DOC_PUBLISHED" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array("PRIVATE", "PUBLIC"), "fieldNameAux" => "inputDocumentPublished"),
"INP_DOC_VERSIONING" => array("type" => "int", "required" => false, "empty" => false, "defaultValues" => array(0, 1), "fieldNameAux" => "inputDocumentVersioning"),
"INP_DOC_DESTINATION_PATH" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "inputDocumentDestinationPath"),
"INP_DOC_TAGS" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "inputDocumentTags")

2
workflow/engine/src/ProcessMaker/BusinessModel/Process.php
View File

@@ -1603,6 +1603,8 @@ class Process
$triggerLibrary = \triggerLibrary::getSingleton();
$library = $triggerLibrary->getRegisteredClasses();
ksort($library);
foreach ($library as $key => $value) {
$libraryName = (preg_match("/^class\.?(.*)\.pmFunctions\.php$/", $key, $arrayMatch))? ((isset($arrayMatch[1]) && $arrayMatch[1] != "")? $arrayMatch[1] : "pmFunctions") : $key;

2
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -105,6 +105,8 @@ class Bpmn extends Handler
// setting defaults
$data['PRJ_UID'] = array_key_exists('PRJ_UID', $data) ? $data['PRJ_UID'] : Common::generateUID();
unset($data["PRJ_UPDATE_DATE"]);
self::log("Create Project with data: ", $data);
$this->project = new Project();
$this->project->fromArray($data, BasePeer::TYPE_FIELDNAME);

2
workflow/engine/src/ProcessMaker/Project/Workflow.php
View File

@@ -44,7 +44,7 @@ class Workflow extends Handler
$process = new Process();
$processData = $process->load($proUid);
} catch (\Exception $e) {
throw new Exception\ProjectNotFound($me, $proUid);
throw $e;
}
$me->process = $processData;