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

Merged in bugfix/PMCORE-1880-2 (pull request #7866)

Browse Source 
PMCORE-1880

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2021-04-09 16:05:26 +00:00
committed by Julio Cesar Laura Avendaño
parent 7ea03cb9ba ae5856f1cc
commit d66c567259
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/Cases.php
View File

@@ -5872,7 +5872,13 @@ class Cases
foreach ($permissions as $row) { foreach ($permissions as $row) {
$userUid = $row['USR_UID']; $userUid = $row['USR_UID'];
$opUserRelation = $row['OP_USER_RELATION']; $opUserRelation = $row['OP_USER_RELATION'];
$opTaskSource = $row['OP_TASK_SOURCE']; $originTask = $row['OP_TASK_SOURCE']; // We can see the steps related to this task
$targetTask = $row['TAS_UID']; // We can see the steps related to this task if is the current task
if (!empty($targetTask)) {
$opTaskSource = $targetTask;
} else {
$opTaskSource = $originTask;
}
$opParticipated = (int) $row['OP_PARTICIPATE']; $opParticipated = (int) $row['OP_PARTICIPATE'];
$opType = $row['OP_OBJ_TYPE']; $opType = $row['OP_OBJ_TYPE'];
$opObjUid = $row['OP_OBJ_UID']; $opObjUid = $row['OP_OBJ_UID'];

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

@@ -14675,12 +14675,6 @@ msgstr "Properties saved successfully"
msgid "Error Update File" msgid "Error Update File"
msgstr "Error Update File" msgstr "Error Update File"
# TRANSLATION
# LABEL/ID_MAFE_7215ee9c7d9dc229d2921a40e899ec5f
#: LABEL/ID_MAFE_7215ee9c7d9dc229d2921a40e899ec5f
msgid "[LABEL/ID_MAFE_7215ee9c7d9dc229d2921a40e899ec5f] "
msgstr ""
# TRANSLATION # TRANSLATION
# LABEL/ID_MAFE_725255d7ccc0cf426c1da6abe0afe7e4 # LABEL/ID_MAFE_725255d7ccc0cf426c1da6abe0afe7e4
#: LABEL/ID_MAFE_725255d7ccc0cf426c1da6abe0afe7e4 #: LABEL/ID_MAFE_725255d7ccc0cf426c1da6abe0afe7e4

6
workflow/engine/src/ProcessMaker/BusinessModel/ProcessPermissions.php
View File

@@ -57,10 +57,10 @@ class ProcessPermissions
$aFields = $oTask->load($aRow['TAS_UID']); $aFields = $oTask->load($aRow['TAS_UID']);
$sTaskTarget = $aFields['TAS_TITLE']; $sTaskTarget = $aFields['TAS_TITLE'];
} catch (\Exception $oError) { } catch (\Exception $oError) {
$sTaskTarget = 'All Tasks'; $sTaskTarget = G::LoadTranslation('ID_SELECT_ONE_OPTION');
} }
} else { } else {
$sTaskTarget = G::LoadTranslation('ID_ANY_TASK'); $sTaskTarget = G::LoadTranslation('ID_SELECT_ONE_OPTION');
} }
//Obtain user or group //Obtain user or group
if ($aRow['OP_USER_RELATION'] == 1) { if ($aRow['OP_USER_RELATION'] == 1) {
@@ -87,7 +87,7 @@ class ProcessPermissions
$aFields = $oTask->load($aRow['OP_TASK_SOURCE']); $aFields = $oTask->load($aRow['OP_TASK_SOURCE']);
$sTaskSource = $aFields['TAS_TITLE']; $sTaskSource = $aFields['TAS_TITLE'];
} catch (\Exception $oError) { } catch (\Exception $oError) {
$sTaskSource = 'All Tasks'; $sTaskSource = G::LoadTranslation('ID_ANY_TASK');
} }
} else { } else {
$sTaskSource = G::LoadTranslation('ID_ANY_TASK'); $sTaskSource = G::LoadTranslation('ID_ANY_TASK');