StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup user and location controllers.

Browse source
This commit is contained in:
Dane Everitt 2017-06-17 17:36:39 -05:00
parent 8ea907e97a
commit cede747442
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 39 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/Http/Controllers/Admin/LocationController.php
View file

@ -41,7 +41,7 @@ class LocationController extends Controller
/**
* @var \Pterodactyl\Models\Location
*/
protected $location;
protected $locationModel;
/**
* @var \Pterodactyl\Services\LocationService
@ -52,13 +52,16 @@ class LocationController extends Controller
* LocationController constructor.
*
* @param \Prologue\Alerts\AlertsMessageBag $alert
* @param \Pterodactyl\Models\Location $location
* @param \Pterodactyl\Services\LocationService $service
* @param \Pterodactyl\Models\Location $locationModel
* @param \Pterodactyl\Services\LocationService $service
*/
public function __construct(AlertsMessageBag $alert, Location $location, LocationService $service)
{
public function __construct(
AlertsMessageBag $alert,
Location $locationModel,
LocationService $service
) {
$this->alert = $alert;
$this->location = $location;
$this->locationModel = $locationModel;
$this->service = $service;
}
@ -70,7 +73,7 @@ class LocationController extends Controller
public function index()
{
return view('admin.locations.index', [
'locations' => $this->location->withCount('nodes', 'servers')->get(),
'locations' => $this->locationModel->withCount('nodes', 'servers')->get(),
]);
}
@ -120,7 +123,7 @@ class LocationController extends Controller
return $this->delete($location);
}
$this->service->update($location, $request->normalize());
$this->service->update($location->id, $request->normalize());
$this->alert->success('Location was updated successfully.')->flash();
return redirect()->route('admin.locations.view', $location->id);
@ -129,7 +132,7 @@ class LocationController extends Controller
/**
* Delete a location from the system.
*
* @param \Pterodactyl\Models\Location $location
* @param \Pterodactyl\Models\Location $location
* @return \Illuminate\Http\RedirectResponse
*
* @throws \Exception
@ -138,7 +141,7 @@ class LocationController extends Controller
public function delete(Location $location)
{
try {
$this->service->delete($location);
$this->service->delete($location->id);
return redirect()->route('admin.locations');
} catch (DisplayException $ex) {