Skip to content

Commit 6af1617

Browse files
authored
Merge pull request #8745 from ProcessMaker/bugfix/FOUR-29531
FOUR-29531 The screen does not open when a user belongs to a self-service group
2 parents a5d5b76 + 33a83b3 commit 6af1617

2 files changed

Lines changed: 15 additions & 0 deletions

File tree

ProcessMaker/Events/ActivityAssigned.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,16 @@ public function broadcastOn()
5454
/**
5555
* Return the process request.
5656
*
57+
* @return \ProcessMaker\Models\ProcessRequest
58+
*/
59+
public function getProcessRequest()
60+
{
61+
return $this->processRequest;
62+
}
63+
64+
/**
65+
* Return the process request token.
66+
*
5767
* @return \ProcessMaker\Models\ProcessRequestToken
5868
*/
5969
public function getProcessRequestToken()

ProcessMaker/Listeners/HandleActivityAssignedInterstitialRedirect.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace ProcessMaker\Listeners;
44

5+
use Auth;
56
use ProcessMaker\Events\ActivityAssigned;
67

78
class HandleActivityAssignedInterstitialRedirect extends HandleRedirectListener
@@ -25,6 +26,9 @@ public function handle(ActivityAssigned $event): void
2526
->getAttribute('process_request_id'),
2627
]);
2728
}
29+
30+
$user = Auth::user();
31+
2832
$this->setRedirectTo($request,
2933
'redirectToTask',
3034
[
@@ -33,6 +37,7 @@ public function handle(ActivityAssigned $event): void
3337
'nodeId' => $event->getProcessRequestToken()->element_id,
3438
'userId' => $event->getProcessRequestToken()->user_id,
3539
'allowInterstitial' => $event->getProcessRequestToken()->getInterstitial()['allow_interstitial'],
40+
'userCanClaim' => !is_null($user) ? $event->getProcessRequest()->canUserClaimASelfServiceTask($user) : false,
3641
]
3742
);
3843
}

0 commit comments

Comments
 (0)