MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-19 06:43:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/vuejs

Browse Source
This commit is contained in:
Dane Everitt
2018-12-16 14:20:35 -08:00
parent cc7f7d7123 f6d0147419
commit 21ffa08d66
54 changed files with 407 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Api/Application/Locations/StoreLocationRequest.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Pterodactyl\Http\Controllers\Api\Application\Locations;
namespace Pterodactyl\Http\Requests\Api\Application\Locations;
use Pterodactyl\Models\Location;
use Pterodactyl\Services\Acl\Api\AdminAcl;

1
app/Http/Requests/Api/Application/Locations/UpdateLocationRequest.php
View File

@@ -3,7 +3,6 @@
namespace Pterodactyl\Http\Requests\Api\Application\Locations;
use Pterodactyl\Models\Location;
use Pterodactyl\Http\Controllers\Api\Application\Locations\StoreLocationRequest;
class UpdateLocationRequest extends StoreLocationRequest
{

11
app/Http/Requests/Api/Client/Servers/GetServerRequest.php
View File

@@ -2,7 +2,6 @@
namespace Pterodactyl\Http\Requests\Api\Client\Servers;
use Pterodactyl\Models\Server;
use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest;
class GetServerRequest extends ClientApiRequest
@@ -18,14 +17,4 @@ class GetServerRequest extends ClientApiRequest
{
return true;
}
/**
* Determine if the user should even know that this server exists.
*
* @return bool
*/
public function resourceExists(): bool
{
return $this->user()->can('view-server', $this->getModel(Server::class));
}
}