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

HOR-61 Adding missing validations ante missing label

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-16 16:46:00 -04:00
parent de3e2411b6
commit d5542e5819
7 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 <developers@colosa.com>\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

2
workflow/engine/data/mssql/insert.sql
View File

@@ -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])

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

@@ -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','','',' ','') ,

4
workflow/engine/methods/users/usersEdit.php
View File

@@ -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');

4
workflow/engine/methods/users/usersInit.php
View File

@@ -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');

4
workflow/engine/methods/users/usersNew.php
View File

@@ -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');

3
workflow/engine/templates/admin/system.js
View File

@@ -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:{