Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions ProcessMaker/Http/Controllers/Api/ProcessController.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,16 +203,19 @@ public function index(Request $request)
return $eventDefinition['$type'] == 'timerEventDefinition';
})->count() > 0;

// Filter out web entry start events
// Filter out web entry start events and email start events
$eventIsWebEntry = false;
$eventIsEmailStart = false;
if (isset($event['config'])) {
$config = json_decode($event['config'], true);
if (isset($config['web_entry']) && $config['web_entry'] !== null) {
$eventIsWebEntry = true;
} elseif (isset($config['email_start']) && $config['email_start'] !== null) {
$eventIsEmailStart = true;
}
}

return !$eventIsTimerStart && !$eventIsWebEntry;
return !$eventIsTimerStart && !$eventIsWebEntry && !$eventIsEmailStart;
})->values();

// Get the id bookmark related
Expand Down Expand Up @@ -1026,16 +1029,19 @@ public function startProcesses(Request $request)
return $eventDefinition['$type'] == 'timerEventDefinition';
})->count() > 0;

// Filter out web entry start events
// Filter out web entry start events and email start events
$eventIsWebEntry = false;
$eventIsEmailStart = false;
if (isset($event['config'])) {
$config = json_decode($event['config'], true);
if (isset($config['web_entry']) && $config['web_entry'] !== null) {
$eventIsWebEntry = true;
} elseif (isset($config['email_start']) && $config['email_start'] !== null) {
$eventIsEmailStart = true;
}
}

return !$eventIsTimerStart && !$eventIsWebEntry;
return !$eventIsTimerStart && !$eventIsWebEntry && !$eventIsEmailStart;
})->values();

// Filter all processes that have event definitions (start events like message event, conditional event, signal event, timer event)
Expand Down