Skip to content

Commit 2680fe4

Browse files
authored
Feature/task order (pterodactyl#3807)
1 parent 8281841 commit 2680fe4

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

app/Jobs/Schedule/RunTaskJob.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ private function queueNextTask()
104104
{
105105
/** @var \Pterodactyl\Models\Task|null $nextTask */
106106
$nextTask = Task::query()->where('schedule_id', $this->task->schedule_id)
107-
->where('sequence_id', $this->task->sequence_id + 1)
107+
->orderBy('sequence_id', 'asc')
108+
->where('sequence_id', '>', $this->task->sequence_id)
108109
->first();
109110

110111
if (is_null($nextTask)) {

app/Repositories/Eloquent/TaskRepository.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public function getTaskForJobProcess(int $id): Task
4141
public function getNextTask(int $schedule, int $index)
4242
{
4343
return $this->getBuilder()->where('schedule_id', '=', $schedule)
44-
->where('sequence_id', '=', $index + 1)
44+
->orderBy('sequence_id', 'asc')
45+
->where('sequence_id', '>', $index)
4546
->first($this->getColumns());
4647
}
4748
}

resources/scripts/components/server/schedules/ScheduleEditContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export default () => {
139139
</div>
140140
<div css={tw`bg-neutral-700 rounded-b`}>
141141
{schedule.tasks.length > 0 ?
142-
schedule.tasks.map(task => (
142+
schedule.tasks.sort((a, b) => a.sequenceId === b.sequenceId ? 0 : (a.sequenceId > b.sequenceId ? 1 : -1)).map(task => (
143143
<ScheduleTaskRow key={`${schedule.id}_${task.id}`} task={task} schedule={schedule}/>
144144
))
145145
:

0 commit comments

Comments
 (0)