Skip to content

Commit fdd1135

Browse files
authored
Merge pull request #8522 from ProcessMaker/bugfix/FOUR-26293
FOUR-26293 The interstitial screen is not assigned by default in a start event
2 parents cebc92e + b256970 commit fdd1135

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

ProcessMaker/Http/Controllers/Api/ScreenController.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,15 @@ public function index(Request $request)
8383
{
8484
$exclusions = ($request->input('exclude', '') ? explode(',', $request->input('exclude', '')) : []);
8585

86-
$query = Screen::nonSystem()
87-
->leftJoin('screen_categories as category', 'screens.screen_category_id', '=', 'category.id')
86+
// Get main query instance
87+
$query = Screen::query();
88+
89+
// Include system srceens if is requested
90+
if (!$request->filled('include_system')) {
91+
$query->nonSystem();
92+
}
93+
94+
$query->leftJoin('screen_categories as category', 'screens.screen_category_id', '=', 'category.id')
8895
->when($request->has('exclude'), function ($query) use ($exclusions) {
8996
$query->exclude($exclusions);
9097
})

resources/js/processes/modeler/components/inspector/ScreenSelect.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ export default {
159159
const params = {
160160
type: this.type(),
161161
interactive: this.interactive(),
162+
include_system: 1,
162163
order_direction: "asc",
163164
status: "active",
164165
selectList: true,
@@ -187,6 +188,7 @@ export default {
187188
ProcessMaker.apiClient
188189
.get("screens", { params: {
189190
key: this.defaultKey,
191+
include_system: 1,
190192
order_by: "id",
191193
order_direction: "ASC",
192194
per_page: 1,

0 commit comments

Comments
 (0)