dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: limits & server creation page

Browse Source
This commit is contained in:
Andras Bacsai
2023-08-21 10:18:11 +02:00
parent 7e37068fc0
commit b7ec1d7d65
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/ServerController.php
View File

@@ -20,8 +20,8 @@ class ServerController extends Controller
}
$servers = auth()->user()->currentTeam()->servers->count();
$subscription = auth()->user()->currentTeam()?->subscription->type();
$limits = config('constants.limits.server')[strtolower($subscription)];
$limit_reached = true ?? $servers >= $limits[$subscription];
$your_limit = config('constants.limits.server')[strtolower($subscription)];
$limit_reached = $servers >= $your_limit;
return view('server.create', [
'limit_reached' => $limit_reached,

2
app/Http/Livewire/Project/New/Select.php
View File

@@ -46,6 +46,6 @@ class Select extends Component
public function load_servers()
{
$this->servers = Server::ownedByCurrentTeam()->get();
$this->servers = Server::isUsable()->get();
}
}

3
app/Models/Server.php
View File

@@ -33,8 +33,9 @@ class Server extends BaseModel
static public function ownedByCurrentTeam(array $select = ['*'])
{
$teamId = auth()->user()->currentTeam()->id;
$selectArray = collect($select)->concat(['id']);
return Server::whereTeamId(auth()->user()->currentTeam()->id)->with('settings')->select($selectArray->all())->orderBy('name');
return Server::whereTeamId($teamId)->with('settings')->select($selectArray->all())->orderBy('name');
}
static public function isUsable()