Skip to content

Commit 20beb2f

Browse files
committed
Fix error causing tasks to be un-deletable.
closes pterodactyl#786
1 parent 47f2ca0 commit 20beb2f

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.php_cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ return PhpCsFixer\Config::create()
5151
'equal' => false,
5252
'identical' => false,
5353
'less_and_greater' => false,
54-
]
54+
],
5555
])->setRiskyAllowed(true)->setFinder($finder);

app/Http/Controllers/Server/Tasks/TaskManagementController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ public function view(Request $request): View
149149
*
150150
* @param \Pterodactyl\Http\Requests\Server\ScheduleCreationFormRequest $request
151151
* @return \Illuminate\Http\RedirectResponse
152-
*
153-
* @throws \Illuminate\Auth\Access\AuthorizationException
154152
*/
155153
public function update(ScheduleCreationFormRequest $request): RedirectResponse
156154
{
@@ -177,7 +175,7 @@ public function update(ScheduleCreationFormRequest $request): RedirectResponse
177175
*/
178176
public function delete(Request $request): Response
179177
{
180-
$server = $request->attributes->get('server_data.model');
178+
$server = $request->attributes->get('server');
181179
$schedule = $request->attributes->get('schedule');
182180
$this->authorize('delete-schedule', $server);
183181

app/Http/Middleware/Server/ScheduleBelongsToServer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function handle(Request $request, Closure $next)
4949
$scheduleId = $this->hashids->decodeFirst($request->route()->parameter('schedule'), 0);
5050
$schedule = $this->repository->getScheduleWithTasks($scheduleId);
5151

52-
if (object_get($schedule, 'server_id') !== $server->id) {
52+
if ($schedule->server_id !== $server->id) {
5353
throw new NotFoundHttpException;
5454
}
5555

0 commit comments

Comments
 (0)