beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

OOM Killer frontend (#820)

Browse source
This commit is contained in:
Dennis 2023-05-07 21:41:53 +02:00 committed by GitHub
parent 66039d1739 a32d42feab
commit d41253a1b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/Admin/ProductController.php
View file

@ -52,12 +52,13 @@ class ProductController extends Controller
]);
}
public function clone(Product $product)
public function clone(Product $product, GeneralSettings $general_settings)
{
$this->checkPermission(self::WRITE_PERMISSION);
return view('admin.products.create', [
'product' => $product,
'credits_display_name' => $general_settings->credits_display_name,
'locations' => Location::with('nodes')->get(),
'nests' => Nest::with('eggs')->get(),
]);
@ -90,8 +91,10 @@ class ProductController extends Controller
'oom_killer' => 'nullable',
]);
$disabled = ! is_null($request->input('disabled'));
$product = Product::create(array_merge($request->all(), ['disabled' => $disabled]));
$oomkiller = ! is_null($request->input('oom_killer'));
$product = Product::create(array_merge($request->all(), ['disabled' => $disabled, 'oom_killer' => $oomkiller]));
//link nodes and eggs
$product->eggs()->attach($request->input('eggs'));
@ -164,7 +167,8 @@ class ProductController extends Controller
]);
$disabled = ! is_null($request->input('disabled'));
$product->update(array_merge($request->all(), ['disabled' => $disabled]));
$oomkiller = ! is_null($request->input('oom_killer'));
$product->update(array_merge($request->all(), ['disabled' => $disabled, 'oom_killer' => $oomkiller]));
//link nodes and eggs
$product->eggs()->detach();

2
app/Http/Controllers/ServerController.php
View file

@ -164,7 +164,7 @@ class ServerController extends Controller
}
//Required Verification for creating an server
if (!$server_settings->creation_enabled && Auth::user()->role != 'admin') {
if (!$server_settings->creation_enabled && Auth::user()->cannot("admin.servers.bypass_creation_enabled")) {
return redirect()->route('servers.index')->with('error', __('The system administrator has blocked the creation of new servers.'));
}

1
config/permissions_web.php
View file

@ -46,6 +46,7 @@ return [
'admin.servers.write.owner',
'admin.servers.write.identifier',
'admin.servers.delete',
'admin.servers.bypass_creation_enabled',
'admin.products.read',
'admin.products.create',

2
themes/default/views/servers/index.blade.php
View file

@ -103,7 +103,7 @@
<span>{{ $server->product->name }}
</span>
<i data-toggle="popover" data-trigger="hover" data-html="true"
data-content="{{ __('CPU') }}: {{ $server->product->cpu / 100 }} {{ __('vCores') }} <br/>{{ __('RAM') }}: {{ $server->product->memory }} MB <br/>{{ __('Disk') }}: {{ $server->product->disk }} MB <br/>{{ __('Backups') }}: {{ $server->product->backups }} <br/> {{ __('MySQL Databases') }}: {{ $server->product->databases }} <br/> {{ __('Allocations') }}: {{ $server->product->allocations }} <br/>"
data-content="{{ __('CPU') }}: {{ $server->product->cpu / 100 }} {{ __('vCores') }} <br/>{{ __('RAM') }}: {{ $server->product->memory }} MB <br/>{{ __('Disk') }}: {{ $server->product->disk }} MB <br/>{{ __('Backups') }}: {{ $server->product->backups }} <br/> {{ __('MySQL Databases') }}: {{ $server->product->databases }} <br/> {{ __('Allocations') }}: {{ $server->product->allocations }} <br/>{{ __('OOM Killer') }}: {{ $server->product->oom_killer ? __("enabled") : __("disabled") }} <br/>"
class="fas fa-info-circle"></i>
</div>

12
themes/default/views/servers/settings.blade.php
View file

@ -204,6 +204,18 @@
</div>
</div>
</div>
<div class="col-lg-6">
<div class="row">
<div class="col-lg-4">
<label>{{__('OOM Killer')}}</label>
</div>
<div class="col-lg-8">
<span style="max-width: 250px;" class="d-inline-block text-truncate">
{{ $server->product->oom_killer ? __("enabled") : __("disabled") }}
</span>
</div>
</div>
</div>
<div class="col-lg-6">
<div class="row">
<div class="col-lg-4">