Skip to content

FOUR-12665 The interstitial screen in the start event stops working #5753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 2 commits into from
Dec 4, 2023
Merged

FOUR-12665 The interstitial screen in the start event stops working #5753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a500326
fix: replace cookie with a param
Dec 4, 2023
f6081b0
fix code smell
Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ProcessMaker/Http/Controllers/ProcessController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public function triggerStartEventApi(Process $process, Request $request)
$apiRequest = new ApiProcessController();
$response = $apiRequest->triggerStartEvent($process, $request);

return redirect('/requests/' . $response->id)->cookie('fromTriggerStartEvent', true, 1);
return redirect('/requests/' . $response->id . '?fromTriggerStartEvent=');
}

private function checkAuth()
Expand Down
12 changes: 9 additions & 3 deletions ProcessMaker/Http/Controllers/RequestController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,22 @@ public function show(ProcessRequest $request, Media $mediaItems)
$definition = $startEvent->getDefinition();
$allowInterstitial = false;
if (isset($definition['allowInterstitial'])) {
$allowInterstitial = filter_var($definition['allowInterstitial'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
$allowInterstitial = filter_var(
$definition['allowInterstitial'],
FILTER_VALIDATE_BOOLEAN,
FILTER_NULL_ON_FAILURE
);
}
if ($allowInterstitial && $request->user_id == Auth::id() && request()->cookie('fromTriggerStartEvent')) {
if ($allowInterstitial && $request->user_id == Auth::id() && request()->has('fromTriggerStartEvent')) {
$active = $request->tokens()
->where('user_id', Auth::id())
->where('element_type', 'task')
->where('status', 'ACTIVE')
->orderBy('id')->first();

return redirect(route('tasks.edit', ['task' => $active ? $active->getKey() : $startEvent->getKey()]))->withoutCookie('fromTriggerStartEvent');
return redirect(route('tasks.edit', [
'task' => $active ? $active->getKey() : $startEvent->getKey()
]));
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions resources/js/components/requests/card.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,10 @@ export default {
.then(response => {
this.spin = 0;
let instance = response.data;
this.$cookies.set('fromTriggerStartEvent', true, '1min');
if (this.$cookies.get("isMobile") === "true") {
window.location = "/requests/mobile/" + instance.id;
} else {
window.location = "/requests/" + instance.id;
window.location = `/requests/${instance.id}?fromTriggerStartEvent=`;
}
}).catch((err) => {
this.disabled = false;
Expand Down