Feature/task order (#3807)
This commit is contained in:
parent
82818414a3
commit
2680fe4c8e
3 changed files with 5 additions and 3 deletions
|
@ -104,7 +104,8 @@ class RunTaskJob extends Job implements ShouldQueue
|
|||
{
|
||||
/** @var \Pterodactyl\Models\Task|null $nextTask */
|
||||
$nextTask = Task::query()->where('schedule_id', $this->task->schedule_id)
|
||||
->where('sequence_id', $this->task->sequence_id + 1)
|
||||
->orderBy('sequence_id', 'asc')
|
||||
->where('sequence_id', '>', $this->task->sequence_id)
|
||||
->first();
|
||||
|
||||
if (is_null($nextTask)) {
|
||||
|
|
|
@ -41,7 +41,8 @@ class TaskRepository extends EloquentRepository implements TaskRepositoryInterfa
|
|||
public function getNextTask(int $schedule, int $index)
|
||||
{
|
||||
return $this->getBuilder()->where('schedule_id', '=', $schedule)
|
||||
->where('sequence_id', '=', $index + 1)
|
||||
->orderBy('sequence_id', 'asc')
|
||||
->where('sequence_id', '>', $index)
|
||||
->first($this->getColumns());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -139,7 +139,7 @@ export default () => {
|
|||
</div>
|
||||
<div css={tw`bg-neutral-700 rounded-b`}>
|
||||
{schedule.tasks.length > 0 ?
|
||||
schedule.tasks.map(task => (
|
||||
schedule.tasks.sort((a, b) => a.sequenceId === b.sequenceId ? 0 : (a.sequenceId > b.sequenceId ? 1 : -1)).map(task => (
|
||||
<ScheduleTaskRow key={`${schedule.id}_${task.id}`} task={task} schedule={schedule}/>
|
||||
))
|
||||
:
|
||||
|
|
Loading…
Reference in a new issue