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

Fixes port deletion for node allocations as well as server notes on allocations.

Browse source 
closes #305
This commit is contained in:
Dane Everitt 2017-02-17 19:59:40 -05:00
parent 22da8d47c8
commit e9762b4277
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Admin/NodesController.php
View file

@ -108,7 +108,7 @@ class NodesController extends Controller
'servers.user', 'servers.service',
'servers.allocations', 'location'
)->findOrFail($id);
$node->setRelation('allocations', $node->allocations()->paginate(40));
$node->setRelation('allocations', $node->allocations()->with('server')->paginate(40));
return view('admin.nodes.view', [
'node' => $node,
@ -151,7 +151,7 @@ class NodesController extends Controller
public function deallocateSingle(Request $request, $node, $allocation)
{
$query = Models\Allocation::where('node', $node)->whereNull('server_id')->where('id', $allocation)->delete();
$query = Models\Allocation::where('node_id', $node)->whereNull('server_id')->where('id', $allocation)->delete();
if ((int) $query === 0) {
return response()->json([
'error' => 'Unable to find an allocation matching those details to delete.',

10
app/Models/Allocation.php
View file

@ -74,4 +74,14 @@ class Allocation extends Model
{
return ! is_null($this->ip_alias);
}
/**
* Gets information for the server associated with this allocation.
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function server()
{
return $this->belongsTo(Server::class);
}
}