From ae5856f1ccf5bf283ea67eaecd47374ac274e116 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Thu, 8 Apr 2021 18:56:42 -0400
Subject: [PATCH] PMCORE-1880

---
 workflow/engine/classes/Cases.php                         | 8 +++++++-
 .../content/translations/english/processmaker.en.po       | 6 ------
 .../src/ProcessMaker/BusinessModel/ProcessPermissions.php | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/workflow/engine/classes/Cases.php b/workflow/engine/classes/Cases.php
index 00fc4bda7..93c72e0f5 100644
--- a/workflow/engine/classes/Cases.php
+++ b/workflow/engine/classes/Cases.php
@@ -5872,7 +5872,13 @@ class Cases
         foreach ($permissions as $row) {
             $userUid = $row['USR_UID'];
             $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'];
             $opType = $row['OP_OBJ_TYPE'];
             $opObjUid = $row['OP_OBJ_UID'];
diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po
index 812a95cce..ac2844a8e 100755
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
@@ -14675,12 +14675,6 @@ msgstr "Properties saved successfully"
 msgid "Error Update File"
 msgstr "Error Update File"
 
-# TRANSLATION
-# LABEL/ID_MAFE_7215ee9c7d9dc229d2921a40e899ec5f
-#: LABEL/ID_MAFE_7215ee9c7d9dc229d2921a40e899ec5f
-msgid "[LABEL/ID_MAFE_7215ee9c7d9dc229d2921a40e899ec5f] "
-msgstr ""
-
 # TRANSLATION
 # LABEL/ID_MAFE_725255d7ccc0cf426c1da6abe0afe7e4
 #: LABEL/ID_MAFE_725255d7ccc0cf426c1da6abe0afe7e4
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessPermissions.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessPermissions.php
index 7a4d21c0d..3caa1785c 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessPermissions.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessPermissions.php
@@ -57,10 +57,10 @@ class ProcessPermissions
                     $aFields = $oTask->load($aRow['TAS_UID']);
                     $sTaskTarget = $aFields['TAS_TITLE'];
                 } catch (\Exception $oError) {
-                    $sTaskTarget = 'All Tasks';
+                    $sTaskTarget = G::LoadTranslation('ID_SELECT_ONE_OPTION');
                 }
             } else {
-                $sTaskTarget = G::LoadTranslation('ID_ANY_TASK');
+                $sTaskTarget = G::LoadTranslation('ID_SELECT_ONE_OPTION');
             }
             //Obtain user or group
             if ($aRow['OP_USER_RELATION'] == 1) {
@@ -87,7 +87,7 @@ class ProcessPermissions
                     $aFields = $oTask->load($aRow['OP_TASK_SOURCE']);
                     $sTaskSource = $aFields['TAS_TITLE'];
                 } catch (\Exception $oError) {
-                    $sTaskSource = 'All Tasks';
+                    $sTaskSource = G::LoadTranslation('ID_ANY_TASK');
                 }
             } else {
                 $sTaskSource = G::LoadTranslation('ID_ANY_TASK');