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

solve conflicts

Browse Source
This commit is contained in:
Rodrigo Quelca
2019-05-17 11:16:18 -04:00
parent ad86c367f6 8252428a0c
commit 81aaae594a
218 changed files with 11380 additions and 9660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/controllers/designer.php
View File

@@ -11,9 +11,10 @@ use ProcessMaker\Plugins\PluginRegistry;
*/
use Maveriks\Util\ClassLoader;
use \OAuth2\Request;
use \ProcessMaker\BusinessModel\Light\Tracker;
use \ProcessMaker\Services\OAuth2\Server;
use OAuth2\Request;
use ProcessMaker\BusinessModel\InputDocument;
use ProcessMaker\BusinessModel\Light\Tracker;
use ProcessMaker\Services\OAuth2\Server;
class Designer extends Controller
{
@@ -27,6 +28,8 @@ class Designer extends Controller
* Index Action
*
* @param string $httpData (opional)
*
* @see Controller->call()
*/
public function index($httpData)
{
@@ -70,6 +73,8 @@ class Designer extends Controller
$this->setVar("SYS_SKIN", SYS_SKIN);
$this->setVar('HTTP_SERVER_HOSTNAME', System::getHttpServerHostnameRequestsFrontEnd());
$this->setVar('PMDYNAFORM_FIRST_TIME', $userProperties->getPmdynaformFirstTime());
$inpuDocument = new InputDocument();
$this->setVar('maxFileSizeInformation', G::json_encode($inpuDocument->getMaxFileSize()));
if ($debug) {
if (!file_exists(PATH_HTML . "lib-dev/pmUI/build.cache")) {