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

conflicts

Browse Source
This commit is contained in:
Paula Quispe
2019-05-02 13:23:23 -04:00
parent a874ab2390
commit 532f872966
2 changed files with 115 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/src/ProcessMaker/Model/Delegation.php
View File

@@ -285,12 +285,12 @@ class Delegation extends Model
// Rewrite priority string
if ($item['DEL_PRIORITY']) {
$item['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$priorities[$item['DEL_PRIORITY']]}");
$item['DEL_PRIORITY'] = G::LoadTranslation("ID_PRIORITY_{$priorities[$item['DEL_PRIORITY']]}", 'en');
}
// Merge in desired application data
if ($item['APP_STATUS']) {
$item['APP_STATUS_LABEL'] = G::LoadTranslation("ID_${item['APP_STATUS']}");
$item['APP_STATUS_LABEL'] = G::LoadTranslation("ID_${item['APP_STATUS']}", 'en');
} else {
$item['APP_STATUS_LABEL'] = $application->APP_STATUS;
}