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

HOR-1697

Browse Source 
System Settings: Se aceptan valores reales/negativos en los campos: "MemoryLimit, CookieLifetime y DefaultUserExpiryDate"
This commit is contained in:
dheeyi william
2017-05-04 15:51:54 -04:00
parent 2ca9a424f5
commit a4d894ea8b
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -2113,6 +2113,24 @@ msgstr "This case does not exist"
msgid "Application ID or Delegation Index is missing!. The System can not open the case."
msgstr "Application ID or Delegation Index is missing!. The System can not open the case."
# TRANSLATION
# LABEL/ID_MEMORY_LIMIT_VALIDATE
#: LABEL/ID_MEMORY_LIMIT_VALIDATE
msgid "Memory Limit value has to be either a positive integer or -1."
msgstr "Memory Limit value has to be either a positive integer or -1."
# TRANSLATION
# LABEL/ID_LIFETIME_VALIDATE
#: LABEL/ID_LIFETIME_VALIDATE
msgid "Max Lifetime value has to be a positive integer."
msgstr "Max Lifetime value has to be a positive integer."
# TRANSLATION
# LABEL/ID_DEFAULT_EXPIRATION_YEAR_VALIDATE
#: LABEL/ID_DEFAULT_EXPIRATION_YEAR_VALIDATE
msgid "Default Expiration Year value has to be a positive integer."
msgstr "Default Expiration Year value has to be a positive integer."
# TRANSLATION
# LABEL/ID_PLEASE_SELECT_UPGRADE_FILE
#: LABEL/ID_PLEASE_SELECT_UPGRADE_FILE

6
workflow/engine/controllers/adminProxy.php
View File

@@ -1538,19 +1538,19 @@ class adminProxy extends HttpProxyController
if (!((is_numeric($httpData->memory_limit)) && ((int)$httpData->memory_limit == $httpData->memory_limit) &&
((int)$httpData->memory_limit >= -1))
) {
throw new Exception('The Memory Limit has to be either a positive integer or -1 ');
throw new Exception(G::LoadTranslation('ID_MEMORY_LIMIT_VALIDATE'));
}
if (!((is_numeric($httpData->max_life_time)) && ((int)$httpData->max_life_time == $httpData->max_life_time) &&
((int)$httpData->max_life_time > 0))
) {
throw new Exception('The Max Lifetime has to be either a positive integer ');
throw new Exception(G::LoadTranslation('ID_LIFETIME_VALIDATE'));
}
if (!((is_numeric($httpData->expiration_year)) && ((int)$httpData->expiration_year == $httpData->expiration_year) &&
((int)$httpData->expiration_year > 0))
) {
throw new Exception('The Default Expiration Year has to be either a positive integer');
throw new Exception(G::LoadTranslation('ID_DEFAULT_EXPIRATION_YEAR_VALIDATE'));
}
if (!file_exists($envFile)) {

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

@@ -1793,6 +1793,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_IN','en','in','2014-01-15') ,
( 'LABEL','ID_CASE_DOES_NOT_EXISTS','en','This case does not exist','2014-01-15') ,
( 'LABEL','ID_APPLICATION_OR_INDEX_MISSING','en','Application ID or Delegation Index is missing!. The System can not open the case.','2017-03-30') ,
( 'LABEL','ID_MEMORY_LIMIT_VALIDATE','en','Memory Limit value has to be either a positive integer or -1','2017-04-05') ,
( 'LABEL','ID_LIFETIME_VALIDATE','en','Max Lifetime value has to be a positive integer','2017-04-05') ,
( 'LABEL','ID_DEFAULT_EXPIRATION_YEAR_VALIDATE','en','Default Expiration Year value has to be a positive integer','2017-04-05') ,
( 'LABEL','ID_PLEASE_SELECT_UPGRADE_FILE','en','Please select the upgrade file','2014-01-15') ,
( 'LABEL','ID_PLEASE_SELECT_MAX_X_FIELDS','en','Please select 80 fields at most','2014-01-15') ,
( 'LABEL','ID_UPGRADE_READY','en','System upgraded from revision','2014-01-15') ,