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-03-20 15:11:30 -04:00
parent 9de72c4132 f2c9366e84
commit b65d3aa48e
15 changed files with 1404 additions and 1293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/src/BusinessModel/CaseTracker.php
View File

@@ -155,13 +155,6 @@ class CaseTracker
//Array DB
$arrayCaseTrackerObject = array();
$arrayCaseTrackerObject[] = array(
"obj_uid" => "char",
"obj_title" => "char",
"obj_description" => "char",
"obj_type" => "char"
);
$delimiter = \DBAdapter::getStringDelimiter();
//DynaForms
@@ -297,13 +290,13 @@ class CaseTracker
);
}
$arrayAvailableCaseTrackerObject = \ProcessMaker\Util\ArrayUtil::sort(
$arrayAvailableCaseTrackerObject,
$arrayCaseTrackerObject = \ProcessMaker\Util\ArrayUtil::sort(
$arrayCaseTrackerObject,
array("obj_type", "obj_title"),
SORT_ASC
);
return $arrayAvailableCaseTrackerObject;
return $arrayCaseTrackerObject;
} catch (\Exception $e) {
throw $e;
}
@@ -390,8 +383,6 @@ class CaseTracker
);
}
//Set data
\G::LoadClass("ArrayPeer");
$arraydbCaseTrackerObject = \ProcessMaker\Util\ArrayUtil::sort($arraydbCaseTrackerObject, array("cto_position"), SORT_ASC);
return $arrayCaseTrackerObject;

5
workflow/engine/src/BusinessModel/WebEntry.php
View File

@@ -477,6 +477,11 @@ class WebEntry
case "HTML":
global $G_FORM;
if (! class_exists("Smarty")) {
$loader = \Maveriks\Util\ClassLoader::getInstance();
$loader->addClass("Smarty", PATH_THIRDPARTY . "smarty".PATH_SEP."libs".PATH_SEP."Smarty.class.php");
}
$G_FORM = new \Form($processUid . "/" . $dynaFormUid, PATH_DYNAFORM, SYS_LANG, false);
$G_FORM->action = $http . $_SERVER["HTTP_HOST"] . "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/services/cases_StartExternal.php";