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

Merge branch 'release/3.7.0' of https://bitbucket.org/colosa/processmaker into bugfix/PMCORE-3328

Browse Source
This commit is contained in:
Henry Jordan
2021-09-22 14:54:20 +00:00
parent da9e084f7b 2c87ee84d4
commit b5f6097627
18 changed files with 357 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3767,6 +3767,12 @@ msgstr "Case List Fields"
msgid "Loading Cases List, please wait..."
msgstr "Loading Cases List, please wait..."
# TRANSLATION
# LABEL/ID_CASES_LIST_SETTINGS
#: LABEL/ID_CASES_LIST_SETTINGS
msgid "Cases List Settings"
msgstr "Cases List Settings"
# TRANSLATION
# LABEL/ID_CASES_LIST_SETUP
#: LABEL/ID_CASES_LIST_SETUP

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

@@ -57439,6 +57439,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CASES_LIST','en','Cases Lists','2015-04-28') ,
( 'LABEL','ID_CASES_LIST_FIELDS','en','Case List Fields','2017-02-21') ,
( 'LABEL','ID_CASES_LIST_GRID_LOADING','en','Loading Cases List, please wait...','2014-01-15') ,
( 'LABEL','ID_CASES_LIST_SETTINGS','en','Cases List Settings','2021-09-20') ,
( 'LABEL','ID_CASES_LIST_SETUP','en','Case Lists','2017-02-21') ,
( 'LABEL','ID_CASES_MENU_ADMIN','en','Process Supervisor','2014-01-15') ,
( 'LABEL','ID_CASES_MENU_FOLDERS','en','Cases','2014-01-15') ,

10
workflow/engine/methods/cases/cases_CatchExecute.php
View File

@@ -42,7 +42,7 @@ $appDelegation = new AppDelegation();
$delegation = $appDelegation->load($appUid, $delIndex);
// if there are no user in the delegation row, this case is still in selfservice
if (empty($delegation['USR_UID'])) {
if ($delegation['USR_UID'] == "") {
$case->setCatchUser($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED']);
/*----------------------------------********---------------------------------*/
$licensedFeatures = PMLicensedFeatures::getSingleton();
@@ -71,7 +71,13 @@ if (empty($delegation['USR_UID'])) {
</script>');
}
} else {
G::SendMessageText(G::LoadTranslation('ID_CASE_ALREADY_DERIVATED'), 'error');
$hideMessage = false;
if (isset($_REQUEST['hideMessage'])) {
$hideMessage = $_REQUEST['hideMessage'] === 'true' ? true : false;
}
if ($hideMessage === false) {
G::SendMessageText(G::LoadTranslation('ID_CASE_ALREADY_DERIVATED'), 'error');
}
}
$validation = (SYS_SKIN != 'uxs') ? 'true' : 'false';

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

@@ -2015,7 +2015,7 @@ class Delegation extends Model
$results = $query->get();
$results->transform(function ($item) {
$abs = new AbstractCases();
$item['TAS_COLOR'] = $abs->getTaskColor($item['DEL_TASK_DUE_DATE']);
$item['TAS_COLOR'] = $abs->getTaskColor($item['DEL_TASK_DUE_DATE'], $item['DEL_THREAD_STATUS']);
$item['TAS_COLOR_LABEL'] = AbstractCases::TASK_COLORS[$item['TAS_COLOR']];
$item['UNASSIGNED'] = ($item['TAS_ASSIGN_TYPE'] === 'SELF_SERVICE' ? true : false);
$userInfo = User::getInformation($item['USR_ID']);

2
workflow/engine/templates/cases/open.js
View File

@@ -457,7 +457,7 @@ Ext.onReady(function(){
*/
function claimCase() {
Ext.Ajax.request({
url: 'cases_CatchExecute',
url: 'cases_CatchExecute?hideMessage=true',
success: function (response, opts) {
Ext.Ajax.request({
url: 'ajaxListener',