Merge pull request pterodactyl#3292 from JulienTant/develop

Make it possible to manually run disable schedule

Author: DaneEveritt

app/Http/Controllers/Api/Client/Servers/ScheduleController.php

@@ -156,10 +156,6 @@ public function update(UpdateScheduleRequest $request, Server $server, Schedule
      */
     public function execute(TriggerScheduleRequest $request, Server $server, Schedule $schedule)
     {
-        if (!$schedule->is_active) {
-            throw new BadRequestHttpException('Cannot trigger schedule exection for a schedule that is not currently active.');
-        }
-
         $this->service->handle($schedule, true);
 
         return new JsonResponse([], JsonResponse::HTTP_ACCEPTED);

app/Jobs/Schedule/RunTaskJob.php

@@ -27,13 +27,19 @@ class RunTaskJob extends Job implements ShouldQueue
      */
     public $task;
 
+    /**
+     * @var bool
+     */
+    public $manualRun;
+
     /**
      * RunTaskJob constructor.
      */
-    public function __construct(Task $task)
+    public function __construct(Task $task, $manualRun = false)
     {
         $this->queue = config('pterodactyl.queues.standard');
         $this->task = $task;
+        $this->manualRun = $manualRun;
     }
 
     /**
@@ -46,8 +52,8 @@ public function handle(
         InitiateBackupService $backupService,
         DaemonPowerRepository $powerRepository
     ) {
-        // Do not process a task that is not set to active.
-        if (!$this->task->schedule->is_active) {
+        // Do not process a task that is not set to active, unless it's been manually triggered.
+        if (!$this->task->schedule->is_active && !$this->manualRun) {
             $this->markTaskNotQueued();
             $this->markScheduleComplete();
 
@@ -101,7 +107,7 @@ private function queueNextTask()
 
         $nextTask->update(['is_queued' => true]);
 
-        $this->dispatch((new self($nextTask))->delay($nextTask->time_offset));
+        $this->dispatch((new self($nextTask, $this->manualRun))->delay($nextTask->time_offset));
     }
 
     /**

app/Services/Schedules/ProcessScheduleService.php

@@ -53,7 +53,7 @@ public function handle(Schedule $schedule, bool $now = false)
             $task->update(['is_queued' => true]);
         });
 
-        $job = new RunTaskJob($task);
+        $job = new RunTaskJob($task, $now);
 
         if (!$now) {
             $this->dispatcher->dispatch($job->delay($task->time_offset));

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

@@ -161,7 +161,7 @@ export default () => {
                                 onDeleted={() => history.push(`/server/${id}/schedules`)}
                             />
                         </Can>
-                        {schedule.isActive && schedule.tasks.length > 0 &&
+                        {schedule.tasks.length > 0 &&
                         <Can action={'schedule.update'}>
                             <RunScheduleButton schedule={schedule}/>
                         </Can>

tests/Integration/Api/Client/Server/Schedule/ExecuteScheduleTest.php

@@ -51,26 +51,6 @@ public function testScheduleIsExecutedRightAway(array $permissions)
         });
     }
 
-    /**
-     * Test that the schedule is not executed if it is not currently active.
-     */
-    public function testScheduleIsNotExecutedIfNotActive()
-    {
-        [$user, $server] = $this->generateTestAccount();
-
-        /** @var \Pterodactyl\Models\Schedule $schedule */
-        $schedule = Schedule::factory()->create([
-            'server_id' => $server->id,
-            'is_active' => false,
-        ]);
-
-        $response = $this->actingAs($user)->postJson($this->link($schedule, '/execute'));
-
-        $response->assertStatus(Response::HTTP_BAD_REQUEST);
-        $response->assertJsonPath('errors.0.code', 'BadRequestHttpException');
-        $response->assertJsonPath('errors.0.detail', 'Cannot trigger schedule exection for a schedule that is not currently active.');
-    }
-
     /**
      * Test that a user without the schedule update permission cannot execute it.
      */