Skip to content

Commit f89e7af

Browse files
committed
fix server workers 500 error
1 parent 7886e2a commit f89e7af

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

app/Policies/WorkerPolicy.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function viewAny(User $user, Server $server, ?Site $site = null): bool
1818
return ($user->isAdmin() || $server->project->users->contains($user)) &&
1919
$server->isReady() &&
2020
(
21-
! $site instanceof \App\Models\Site ||
21+
! $site instanceof Site ||
2222
(
2323
$site->hasFeature(SiteFeature::WORKERS) &&
2424
$site->isReady()
@@ -29,11 +29,11 @@ public function viewAny(User $user, Server $server, ?Site $site = null): bool
2929
public function view(User $user, Worker $worker, Server $server, ?Site $site = null): bool
3030
{
3131
return ($user->isAdmin() || $server->project->users->contains($user)) &&
32-
$site->server_id === $server->id &&
3332
$server->isReady() &&
3433
(
35-
! $site instanceof \App\Models\Site ||
34+
! $site instanceof Site ||
3635
(
36+
$site->server_id === $server->id &&
3737
$site->hasFeature(SiteFeature::WORKERS) &&
3838
$site->isReady() &&
3939
$worker->site_id === $site->id
@@ -46,7 +46,7 @@ public function create(User $user, Server $server, ?Site $site = null): bool
4646
return ($user->isAdmin() || $server->project->users->contains($user)) &&
4747
$server->isReady() &&
4848
(
49-
! $site instanceof \App\Models\Site ||
49+
! $site instanceof Site ||
5050
(
5151
$site->hasFeature(SiteFeature::WORKERS) &&
5252
$site->isReady()
@@ -57,11 +57,11 @@ public function create(User $user, Server $server, ?Site $site = null): bool
5757
public function update(User $user, Worker $worker, Server $server, ?Site $site = null): bool
5858
{
5959
return ($user->isAdmin() || $server->project->users->contains($user)) &&
60-
$site->server_id === $server->id &&
6160
$server->isReady() &&
6261
(
63-
! $site instanceof \App\Models\Site ||
62+
! $site instanceof Site ||
6463
(
64+
$site->server_id === $server->id &&
6565
$site->hasFeature(SiteFeature::WORKERS) &&
6666
$site->isReady() &&
6767
$worker->site_id === $site->id
@@ -72,11 +72,11 @@ public function update(User $user, Worker $worker, Server $server, ?Site $site =
7272
public function delete(User $user, Worker $worker, Server $server, ?Site $site = null): bool
7373
{
7474
return ($user->isAdmin() || $server->project->users->contains($user)) &&
75-
$site->server_id === $server->id &&
7675
$server->isReady() &&
7776
(
78-
! $site instanceof \App\Models\Site ||
77+
! $site instanceof Site ||
7978
(
79+
$site->server_id === $server->id &&
8080
$site->hasFeature(SiteFeature::WORKERS) &&
8181
$site->isReady() &&
8282
$worker->site_id === $site->id

app/Web/Pages/Servers/Workers/Actions/Create.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static function form(Server $server, ?Site $site = null): array
2424
->helperText('Example: php /home/vito/your-site/artisan queue:work'),
2525
Select::make('user')
2626
->rules(fn (callable $get) => CreateWorker::rules($server, $site)['user'])
27-
->options($server->getSshUsers()),
27+
->options(array_combine($server->getSshUsers(), $server->getSshUsers())),
2828
TextInput::make('numprocs')
2929
->default(1)
3030
->rules(CreateWorker::rules($server, $site)['numprocs'])

app/Web/Pages/Servers/Workers/Widgets/WorkersList.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ protected function getTableQuery(): Builder
4444
return Worker::query()
4545
->where('server_id', $this->server->id)
4646
->where(function (Builder $query): void {
47-
if ($this->site instanceof \App\Models\Site) {
47+
if ($this->site instanceof Site) {
4848
$query->where('site_id', $this->site->id);
49+
} else {
50+
$query->whereNull('site_id');
4951
}
5052
});
5153
}

0 commit comments

Comments
 (0)