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

Merged in bugfix/PMCORE-737 (pull request #7468)

Browse Source 
PMCORE-737

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2020-09-17 20:28:11 +00:00
committed by Julio Cesar Laura Avendaño
parent 9533307f0f e8b47866b2
commit bddc70ef22
8 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,6 +399,10 @@
<index name="INDEX_APP_MSG_STATUS_ID">
<index-column name="APP_MSG_STATUS_ID"/>
</index>
<index name="indexAppUidSendDate">
<index-column name="APP_UID"/>
<index-column name="APP_MSG_SEND_DATE"/>
</index>
</table>
<table name="APP_OWNER">
<vendor type="mysql">

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

@@ -179,7 +179,8 @@ CREATE TABLE `APP_MESSAGE`
KEY `INDEX_TAS_ID`(`TAS_ID`),
KEY `INDEX_APP_NUMBER`(`APP_NUMBER`),
KEY `INDEX_APP_MSG_TYPE_ID`(`APP_MSG_STATUS_ID`),
KEY `INDEX_APP_MSG_STATUS_ID`(`APP_MSG_STATUS_ID`)
KEY `INDEX_APP_MSG_STATUS_ID`(`APP_MSG_STATUS_ID`),
KEY `indexAppUidSendDate`(`APP_UID`, `APP_MSG_SEND_DATE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Messages in an Application';
#-----------------------------------------------------------------------------
#-- APP_OWNER

8
workflow/engine/js/src/PM.js
View File

@@ -3,3 +3,11 @@ var PM = PM || {};
PM.version = '3.0.1.8';
}());
// Overwrite the global ajax timeout
try {
if (parent.ext_ajax_timeout) {
Ext.Ajax.timeout = parent.ext_ajax_timeout;
}
} catch (error) {
// Nothing to_do
}

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

@@ -81,7 +81,8 @@ class System
'pmftotalcalculation_floating_point_number' => 10,
'report_table_batch_regeneration' => 1000,
'report_table_floating_number' => 4,
'report_table_double_number' => 4
'report_table_double_number' => 4,
'ext_ajax_timeout' => 600000
];
/**

1
workflow/engine/templates/setup/languages.js
View File

@@ -24,7 +24,6 @@ var removeOption;
var installOption;
var exportOption;
Ext.Ajax.timeout = 300000;
Ext.onReady(function(){
//Ext.state.Manager.setProvider(new Ext.state.CookieProvider());

1
workflow/engine/templates/setup/newSite.js
View File

@@ -3,7 +3,6 @@
* Jan 15th, 2011
*/
Ext.Ajax.timeout = 300000;
Ext.onReady(function(){
var fieldNameWS,

1
workflow/public_html/sysGeneric.php
View File

@@ -334,6 +334,7 @@ define('DISABLE_DOWNLOAD_DOCUMENTS_SESSION_VALIDATION', $config['disable_downloa
define('LOGS_MAX_FILES', $config['logs_max_files']);
define('LOGS_LOCATION', $config['logs_location']);
define('LOGGING_LEVEL', $config['logging_level']);
define('EXT_AJAX_TIMEOUT', $config['ext_ajax_timeout']);
define('TIME_ZONE', ini_get('date.timezone'));
/*----------------------------------********---------------------------------*/
define('HIGHLIGHT_HOME_FOLDER_ENABLE', $config['highlight_home_folder_enable'] === "1");