From d5542e58190e682ef48a0ee388c2967c0323c86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?= Date: Tue, 16 Aug 2016 16:46:00 -0400 Subject: [PATCH] HOR-61 Adding missing validations ante missing label --- .../translations/english/processmaker.en.po | 32 ++++++++++++++++++- workflow/engine/data/mssql/insert.sql | 2 ++ workflow/engine/data/mysql/insert.sql | 3 +- workflow/engine/methods/users/usersEdit.php | 4 +-- workflow/engine/methods/users/usersInit.php | 4 +-- workflow/engine/methods/users/usersNew.php | 4 +-- workflow/engine/templates/admin/system.js | 3 +- 7 files changed, 43 insertions(+), 9 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 88e44892e..874907e85 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ProcessMaker (Branch 3.1)\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2016-08-12 23:48:36\n" +"PO-Revision-Date: 2016-08-16 20:08:15\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -27647,6 +27647,36 @@ msgstr "Force user login" msgid "Supported Controls: Multiple File." msgstr "Supported Controls: Multiple File." +# TRANSLATION +# LABEL/ID_DEFAULT_EXPIRATION_YEAR +#: LABEL/ID_DEFAULT_EXPIRATION_YEAR +msgid "Default user expiry date (years)" +msgstr "Default user expiry date (years)" + +# TRANSLATION +# LABEL/ID_MAFE_497f247967ea9a295c48effdc025c1a1 +#: LABEL/ID_MAFE_497f247967ea9a295c48effdc025c1a1 +msgid "Email From Format" +msgstr "Email From Format" + +# TRANSLATION +# LABEL/ID_MAFE_28a7de43bb5297bf6122425d52210f93 +#: LABEL/ID_MAFE_28a7de43bb5297bf6122425d52210f93 +msgid "Assigned User" +msgstr "Assigned User" + +# TRANSLATION +# LABEL/ID_MAFE_31d1eacb86fc41c8ba34934923e8b53e +#: LABEL/ID_MAFE_31d1eacb86fc41c8ba34934923e8b53e +msgid "Email Account Settings" +msgstr "Email Account Settings" + +# TRANSLATION +# LABEL/ID_MAFE_d4903c30cd1efde76c02488c8697503b +#: LABEL/ID_MAFE_d4903c30cd1efde76c02488c8697503b +msgid "Assigned user" +msgstr "Assigned user" + # additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml #: text - ADD_TAB_NAME diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index 460892135..70380c62b 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -10756,6 +10756,8 @@ SELECT 'LABEL','ID_MAFE_4e357e7345689cff230335282b201a11','en','Enable camera',' SELECT 'LABEL','ID_MAFE_5582ead0a9ee86a54da29c20caee6f57','en','Force user login','2016-08-12' UNION ALL SELECT 'LABEL','ID_MAFE_f82e519e2e82239be5f49d78b24ea228','en','Supported Controls: Multiple File.','2016-08-12' + UNION ALL +SELECT 'LABEL','ID_DEFAULT_EXPIRATION_YEAR','en','Default user expiry date (years)','2016-08-12' ; INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID]) diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 94315ecc9..bd7c6de44 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -6151,7 +6151,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MAFE_1de162d73f017a9243ce0c939064a014','en','Enable gallery','2016-08-12') , ( 'LABEL','ID_MAFE_4e357e7345689cff230335282b201a11','en','Enable camera','2016-08-12') , ( 'LABEL','ID_MAFE_5582ead0a9ee86a54da29c20caee6f57','en','Force user login','2016-08-12') , -( 'LABEL','ID_MAFE_f82e519e2e82239be5f49d78b24ea228','en','Supported Controls: Multiple File.','2016-08-12') ; +( 'LABEL','ID_MAFE_f82e519e2e82239be5f49d78b24ea228','en','Supported Controls: Multiple File.','2016-08-12') , +( 'LABEL','ID_DEFAULT_EXPIRATION_YEAR','en','Default user expiry date (years)','2016-08-12') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , diff --git a/workflow/engine/methods/users/usersEdit.php b/workflow/engine/methods/users/usersEdit.php index 398a1f984..004cb8f0f 100644 --- a/workflow/engine/methods/users/usersEdit.php +++ b/workflow/engine/methods/users/usersEdit.php @@ -19,7 +19,7 @@ $envFile = PATH_CONFIG . 'env.ini'; if (file_exists($envFile) ) { $sysConf = System::getSystemConfiguration($envFile); if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){ - $expirationDate = $sysConf['expiration_year']; + $expirationDate = abs($sysConf['expiration_year']); } } @@ -41,7 +41,7 @@ $oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' ); $oHeadPublisher->assign('SYSTEM_TIME_ZONE', $arraySystemConfiguration['time_zone']); $oHeadPublisher->assign('TIME_ZONE_DATA', array_map(function ($value) { return [$value, $value]; }, DateTimeZone::listIdentifiers())); $oHeadPublisher->assign('__SYSTEM_UTC_TIME_ZONE__', (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])? 1 : 0); -$oHeadPublisher->assign('EXPIRATION_DATE', (int)$expirationDate); +$oHeadPublisher->assign('EXPIRATION_DATE', $expirationDate); $oHeadPublisher->assign('LANGUAGE_MANAGEMENT', $languageManagement); $oHeadPublisher->assign('__ACTION__', 'saveUser'); diff --git a/workflow/engine/methods/users/usersInit.php b/workflow/engine/methods/users/usersInit.php index 7faf2838a..30bb5ac1f 100644 --- a/workflow/engine/methods/users/usersInit.php +++ b/workflow/engine/methods/users/usersInit.php @@ -34,7 +34,7 @@ $envFile = PATH_CONFIG . 'env.ini'; if (file_exists($envFile) ) { $sysConf = System::getSystemConfiguration($envFile); if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){ - $expirationDate = $sysConf['expiration_year']; + $expirationDate = abs($sysConf['expiration_year']); } } @@ -61,7 +61,7 @@ $oHeadPublisher->assign( 'MODE', '' ); $oHeadPublisher->assign('SYSTEM_TIME_ZONE', $arraySystemConfiguration['time_zone']); $oHeadPublisher->assign('TIME_ZONE_DATA', array_map(function ($value) { return [$value, $value]; }, DateTimeZone::listIdentifiers())); $oHeadPublisher->assign('__SYSTEM_UTC_TIME_ZONE__', (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])? 1 : 0); -$oHeadPublisher->assign('EXPIRATION_DATE', (int)$expirationDate); +$oHeadPublisher->assign('EXPIRATION_DATE', $expirationDate); $oHeadPublisher->assign('LANGUAGE_MANAGEMENT', $languageManagement); $oHeadPublisher->assign('__ACTION__', 'savePersonalInfo'); diff --git a/workflow/engine/methods/users/usersNew.php b/workflow/engine/methods/users/usersNew.php index 1127bd327..b93a6c1b4 100644 --- a/workflow/engine/methods/users/usersNew.php +++ b/workflow/engine/methods/users/usersNew.php @@ -22,7 +22,7 @@ $envFile = PATH_CONFIG . 'env.ini'; if (file_exists($envFile) ) { $sysConf = System::getSystemConfiguration($envFile); if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){ - $expirationDate = $sysConf['expiration_year']; + $expirationDate = abs($sysConf['expiration_year']); } } @@ -45,7 +45,7 @@ $oHeadPublisher->assign('MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') '); $oHeadPublisher->assign('SYSTEM_TIME_ZONE', $arraySystemConfiguration['time_zone']); $oHeadPublisher->assign('TIME_ZONE_DATA', array_map(function ($value) { return [$value, $value]; }, DateTimeZone::listIdentifiers())); $oHeadPublisher->assign('__SYSTEM_UTC_TIME_ZONE__', (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__'])? 1 : 0); -$oHeadPublisher->assign('EXPIRATION_DATE', (int)$expirationDate); +$oHeadPublisher->assign('EXPIRATION_DATE', $expirationDate); $oHeadPublisher->assign('LANGUAGE_MANAGEMENT', $languageManagement); $oHeadPublisher->assign('__ACTION__', 'saveUser'); diff --git a/workflow/engine/templates/admin/system.js b/workflow/engine/templates/admin/system.js index 20a985bab..0b6879df7 100644 --- a/workflow/engine/templates/admin/system.js +++ b/workflow/engine/templates/admin/system.js @@ -99,7 +99,8 @@ Ext.onReady(function(){ if(value > 0) { return true; } else { - PMExt.error( _('ID_ERROR'), _('ERROR_ONLY_POSITIVE_NUMBER')); + PMExt.error( _('ID_ERROR'), _('ID_INVALID_VALUE_EXPECTING_POSITIVE_INTEGER', _('ID_DEFAULT_EXPIRATION_YEAR'))); + return false; } }, listeners:{