Merge branch 'develop' into feature/vuejs

This commit is contained in:
Dane Everitt 2018-09-23 13:14:46 -07:00
commit b6205463db
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
33 changed files with 797 additions and 246 deletions

View file

@ -285,6 +285,27 @@ class NodesController extends Controller
return response('', 204);
}
/**
* Removes multiple individual allocations from a node.
*
* @param \Illuminate\Http\Request $request
* @param int $node
* @return \Illuminate\Http\Response
*
* @throws \Pterodactyl\Exceptions\Service\Allocation\ServerUsingAllocationException
*/
public function allocationRemoveMultiple(Request $request, int $node): Response
{
$allocations = $request->input('allocations');
foreach ($allocations as $rawAllocation) {
$allocation = new Allocation();
$allocation->id = $rawAllocation['id'];
$this->allocationRemoveSingle($node, $allocation);
}
return response('', 204);
}
/**
* Remove all allocations for a specific IP at once on a node.
*