diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue index ca7fd3edd..8253b74a7 100644 --- a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue +++ b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue @@ -395,25 +395,25 @@ export default { let obj = this.dataCasesByRisk[seriesIndex]; return `
- ${"Number Case"} : ${obj["number_case"]} + ${this.$t("ID_CASE_NUMBER")} : ${obj["number_case"]}
- Delegated : ${ + ${this.$t("ID_DELEGATED")} : ${ obj["delegated"] }
- At Risk : ${ + ${this.$t("ID_AT_RISK")} : ${ obj["at_risk"] }
- Due Date : ${ + ${this.$t("ID_CASESLIST_DEL_TASK_DUE_DATE")} : ${ obj["due_date"] }
diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php index 574077689..1d63bfe4d 100644 --- a/workflow/engine/classes/WorkspaceTools.php +++ b/workflow/engine/classes/WorkspaceTools.php @@ -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']; diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php index 31781fabd..97617f7a4 100644 --- a/workflow/engine/classes/model/Users.php +++ b/workflow/engine/classes/model/Users.php @@ -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']; diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 277e4f3c8..51a7300d3 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -4314,7 +4314,7 @@ - + @@ -6049,10 +6049,10 @@ - - - - + + + + @@ -6086,9 +6086,9 @@ - + - + diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 23b39b283..7cebc9c25 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -6101,6 +6101,12 @@ msgstr "Delay Field" msgid "Delayed" msgstr "Delayed" +# TRANSLATION +# LABEL/ID_DELEGATED +#: LABEL/ID_DELEGATED +msgid "Delegated" +msgstr "Delegated" + # TRANSLATION # LABEL/ID_DELEGATE_DATE_FROM #: LABEL/ID_DELEGATE_DATE_FROM diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 9d6cb801b..8f1e4db3f 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -57844,6 +57844,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_DEFINITION','en','Definition','2014-01-15') , ( 'LABEL','ID_DELAY_FIELD','en','Delay Field','2014-01-15') , ( 'LABEL','ID_DELAYED','en','Delayed','2021-01-20') , +( 'LABEL','ID_DELEGATED','en','Delegated','2022-01-12') , ( 'LABEL','ID_DELEGATE_DATE_FROM','en','Date from','2017-10-18') , ( 'LABEL','ID_DELEGATE_DATE_TO','en','to','2014-01-15') , ( 'LABEL','ID_DELEGATE_USER','en','Delegated User','2014-01-15') , diff --git a/workflow/engine/methods/authenticationSources/src/components/formAuthenticationSources.vue b/workflow/engine/methods/authenticationSources/src/components/formAuthenticationSources.vue index 03b361b8e..45315dc41 100644 --- a/workflow/engine/methods/authenticationSources/src/components/formAuthenticationSources.vue +++ b/workflow/engine/methods/authenticationSources/src/components/formAuthenticationSources.vue @@ -488,11 +488,11 @@ gridText: JSON.stringify(gridText), signInPolicyForLDAP: row.AUTH_SOURCE_SIGNIN_POLICY_FOR_LDAP, inactiveUsers: row.AUTH_SOURCE_RETIRED_OU, - role: row.USR_ROLE, - groupIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_GROUP, - userClassIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_CLASS, - groupClassIdentifier: row.GROUP_CLASS_IDENTIFIER, - departmentClassIdentifier: row.DEPARTMENT_CLASS_IDENTIFIER + role: row.USR_ROLE || "", + groupIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_GROUP || "", + userClassIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_CLASS || "", + groupClassIdentifier: row.GROUP_CLASS_IDENTIFIER || "", + departmentClassIdentifier: row.DEPARTMENT_CLASS_IDENTIFIER || "" }; return obj; }, diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php index 9396f4bd7..4afde1594 100755 --- a/workflow/engine/methods/users/usersAjax.php +++ b/workflow/engine/methods/users/usersAjax.php @@ -132,7 +132,7 @@ try { $data = [['LAN_ID' => '', 'LAN_NAME' => '- ' . G::LoadTranslation('ID_NONE') . ' -']]; foreach ($languages as $lang) { $data[] = [ - 'LAN_ID' => $lang['LOCALE'], + 'LAN_ID' => strtolower($lang['LAN_ID']), 'LAN_NAME' => $lang['LANGUAGE'] ]; } diff --git a/workflow/engine/src/ProcessMaker/Project/Bpmn.php b/workflow/engine/src/ProcessMaker/Project/Bpmn.php index 5ddd6ac05..1c6451f6d 100644 --- a/workflow/engine/src/ProcessMaker/Project/Bpmn.php +++ b/workflow/engine/src/ProcessMaker/Project/Bpmn.php @@ -408,17 +408,19 @@ class Bpmn extends Handler $project->delete(); } - $process = new Processes(); - $repTable = $process->getReportTables($this->getUid()); - $rows = []; - foreach ($repTable as $table) { - array_push($rows, ["id" => $table["ADD_TAB_UID"], "type" => ""]); - } - if (!empty($rows)) { - $httpData = (object)[]; - $httpData->rows = json_encode($rows); - $repTable = new pmTablesProxy(); - $repTable->delete($httpData); + if (!$force) { + $process = new Processes(); + $repTable = $process->getReportTables($this->getUid()); + $rows = []; + foreach ($repTable as $table) { + array_push($rows, ["id" => $table["ADD_TAB_UID"], "type" => ""]); + } + if (!empty($rows)) { + $httpData = (object)[]; + $httpData->rows = json_encode($rows); + $repTable = new pmTablesProxy(); + $repTable->delete($httpData); + } } self::log("Remove Project Success!"); @@ -1689,5 +1691,4 @@ class Bpmn extends Handler throw $e; } } - }