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

Merged in bugfix/PMC-1199 (pull request #7078)

Browse Source 
PMC-1199

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2019-09-18 14:13:03 +00:00
committed by Julio Cesar Laura Avendaño
parent 5272d7ea89 b34f8bf2a1
commit 4ee6d7ce2d
5 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bootstrap/app.php
View File

@@ -8,6 +8,7 @@ use Illuminate\Foundation\Exceptions\Handler;
use Illuminate\Foundation\Http\Kernel as Kernel3;
use Monolog\Formatter\LineFormatter;
use Monolog\Handler\RotatingFileHandler;
use ProcessMaker\Core\System;
/*
|--------------------------------------------------------------------------
@@ -50,6 +51,8 @@ $app->singleton(
Handler::class
);
$app->useStoragePath(System::getPathsInstalled()->pathData);
/*
|--------------------------------------------------------------------------
| Return The Application

4
config/customMimeTypes.php
View File

@@ -84,7 +84,7 @@ return [
'crl' => 'application/pkix-crl',
'crt' => 'application/x-x509-user-cert',
'csh' => 'text/x-script.csh',
'css' => 'text/css',
'css' => ['text/css', 'text/plain'],
'cst' => 'application/x-director',
'cxt' => 'application/x-director',
'cxx' => ['text/x-c', 'text/plain'],
@@ -220,7 +220,7 @@ return [
'jpgm' => 'video/jpm',
'jpm' => 'video/jpm',
'jps' => 'image/x-jps',
'js' => 'text/ecmascript',
'js' => ['text/ecmascript', 'text/plain'],
'json' => ['text/plain', 'text/json', 'text/javascript'],
'jsonp' => 'application/javascript',
'jut' => 'image/jutvision',

22
workflow/engine/config/schema.xml
View File

@@ -328,6 +328,10 @@
<index-column name="DOC_VERSION"/>
<index-column name="APP_DOC_TYPE"/>
</index>
<index name="indexFolderUidDocStatus">
<index-column name="FOLDER_UID"/>
<index-column name="APP_DOC_STATUS"/>
</index>
</table>
<table name="APP_MESSAGE" idMethod="native">
<vendor type="mysql">
@@ -1310,6 +1314,16 @@
<rule name="validValues" value="DYNAFORM|INPUT_DOCUMENT|MESSAGE|OUTPUT_DOCUMENT|EXTERNAL"
message="Please select a valid value for STEP_TYPE_OBJ."/>
</validator>
<index name="indexTasUidTypeUidObj">
<index-column name="TAS_UID"/>
<index-column name="STEP_TYPE_OBJ"/>
<index-column name="STEP_UID_OBJ"/>
</index>
<index name="indexProUidTasUidPosition">
<index-column name="PRO_UID"/>
<index-column name="TAS_UID"/>
<index-column name="STEP_POSITION"/>
</index>
</table>
<table name="STEP_TRIGGER">
<vendor type="mysql">
@@ -1559,6 +1573,10 @@
<rule name="validValues" value="NORMAL|FAST|AUTOMATIC"
message="Please select a valid value for TAS_DERIVATION."/>
</validator>
<index name="indexAssgTypeGrpVar">
<index-column name="TAS_ASSIGN_TYPE"/>
<index-column name="TAS_GROUP_VARIABLE"/>
</index>
</table>
<table name="TASK_USER">
<vendor type="mysql">
@@ -1603,6 +1621,10 @@
<rule name="validValues" value="1|2" message="Please select a valid relation."/>
<rule name="required" message="Relation is required."/>
</validator>
<index name="indexUsrUidType">
<index-column name="USR_UID"/>
<index-column name="TU_TYPE"/>
</index>
</table>
<table name="TRANSLATION">
<vendor type="mysql">

13
workflow/engine/data/mysql/schema.sql
View File

@@ -136,7 +136,8 @@ CREATE TABLE `APP_DOCUMENT`
PRIMARY KEY (`APP_DOC_UID`,`DOC_VERSION`),
KEY `indexAppDocument`(`FOLDER_UID`, `APP_DOC_UID`),
KEY `indexAppUid`(`APP_UID`),
KEY `indexAppUidDocUidDocVersionDocType`(`APP_UID`, `DOC_UID`, `DOC_VERSION`, `APP_DOC_TYPE`)
KEY `indexAppUidDocUidDocVersionDocType`(`APP_UID`, `DOC_UID`, `DOC_VERSION`, `APP_DOC_TYPE`),
KEY `indexFolderUidDocStatus`(`FOLDER_UID`, `APP_DOC_STATUS`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Documents in an Application';
#-----------------------------------------------------------------------------
#-- APP_MESSAGE
@@ -619,7 +620,9 @@ CREATE TABLE `STEP`
`STEP_CONDITION` MEDIUMTEXT NOT NULL,
`STEP_POSITION` INTEGER default 0 NOT NULL,
`STEP_MODE` VARCHAR(10) default 'EDIT',
PRIMARY KEY (`STEP_UID`)
PRIMARY KEY (`STEP_UID`),
KEY `indexTasUidTypeUidObj`(`TAS_UID`, `STEP_TYPE_OBJ`, `STEP_UID_OBJ`),
KEY `indexProUidTasUidPosition`(`PRO_UID`, `TAS_UID`, `STEP_POSITION`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- STEP_TRIGGER
@@ -735,7 +738,8 @@ CREATE TABLE `TASK`
`TAS_RECEIVE_MESSAGE` MEDIUMTEXT,
PRIMARY KEY (`TAS_UID`),
UNIQUE KEY `INDEX_TAS_ID` (`TAS_ID`),
KEY `indexTasUid`(`TAS_UID`)
KEY `indexTasUid`(`TAS_UID`),
KEY `indexAssgTypeGrpVar`(`TAS_ASSIGN_TYPE`, `TAS_GROUP_VARIABLE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Task of workflow';
#-----------------------------------------------------------------------------
#-- TASK_USER
@@ -752,7 +756,8 @@ CREATE TABLE `TASK_USER`
`TU_TYPE` INTEGER default 1 NOT NULL,
`TU_RELATION` INTEGER default 0 NOT NULL,
`ASSIGNED_ID` INTEGER default 0,
PRIMARY KEY (`TAS_UID`,`USR_UID`,`TU_TYPE`,`TU_RELATION`)
PRIMARY KEY (`TAS_UID`,`USR_UID`,`TU_TYPE`,`TU_RELATION`),
KEY `indexUsrUidType`(`USR_UID`, `TU_TYPE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------
#-- TRANSLATION

27
workflow/engine/src/ProcessMaker/Core/System.php
View File

@@ -1656,5 +1656,30 @@ class System
app()->make(Kernel::class)->bootstrap();
restore_error_handler();
}
/**
* If the installation file exists it returns the defined values.
* @return object
*/
public static function getPathsInstalled()
{
//default values
$result = [
'pathData' => getcwd() . '/shared',
'pathCompiled' => getcwd() . '/shared/compiled',
];
$pathsInstalled = getcwd() . "/workflow/engine/config/paths_installed.php";
if (file_exists($pathsInstalled)) {
$script = "require_once '{$pathsInstalled}';"
. "return ["
. "'pathData' => PATH_DATA,"
. "'pathCompiled' => PATH_C,"
. "'hashInstallation' => HASH_INSTALLATION,"
. "'systemHash' => SYSTEM_HASH,"
. "];";
$result = eval($script);
}
return (object) $result;
}
}
// end System class