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

Merged in release/3.7.3 (pull request #8354)

Browse Source 
release/3.7.3

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2022-01-20 21:08:41 +00:00
committed by Julio Cesar Laura Avendaño
parent 9355bb16de 3a57f8c800
commit 95e8fbe6b4
9 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/WorkspaceTools.php
View File

@@ -832,6 +832,16 @@ class WorkspaceTools
$description = $database->executeQuery($database->generateDescTableSQL($table));
$oldSchema[$table] = [];
foreach ($description as $field) {
$type = $field['Type'];
if ($type === "int") {
$field['Type'] = $type . "(11)";
}
if ($type === "tinyint") {
$field['Type'] = $type . "(4)";
}
if ($type === "bigint") {
$field['Type'] = $type . "(20)";
}
$oldSchema[$table][$field['Field']]['Field'] = $field['Field'];
$oldSchema[$table][$field['Field']]['Type'] = $field['Type'];
$oldSchema[$table][$field['Field']]['Null'] = $field['Null'];

3
workflow/engine/classes/model/Users.php
View File

@@ -198,6 +198,9 @@ class Users extends BaseUsers
if (empty($aFields['USR_DEFAULT_LANG'])) {
$aFields['USR_DEFAULT_LANG'] = 'en';
}
//sometimes the USR_DEFAULT_LANG value is made up, it is formatted in order to find the value.
$explode = explode('-', $aFields['USR_DEFAULT_LANG']);
$aFields['USR_DEFAULT_LANG'] = strtolower($explode[0]);
$translations = new Language();
$translation = $translations->loadByCode($aFields['USR_DEFAULT_LANG']);
$aFields['USR_DEFAULT_LANG_NAME'] = $translation['LANGUAGE_NAME'];