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

Push initial implementations of new repository structure

Browse source 
This breaks almost the entire panel, do not pull this branch in this state.

Mostly just moved old repository files to a new folder without updating anything else in order to start doing new things. Structure is not finalized.
This commit is contained in:
Dane Everitt 2017-06-10 22:28:44 -05:00
parent 65957e7ea5
commit 5c2b9deb09
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
39 changed files with 1083 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/Http/Controllers/Admin/OptionController.php
View file

@ -26,8 +26,10 @@ namespace Pterodactyl\Http\Controllers\Admin;
use Log;
use Alert;
use Route;
use Javascript;
use Illuminate\Http\Request;
use Pterodactyl\Http\Requests\Admin\Service\EditOptionScript;
use Pterodactyl\Models\Service;
use Pterodactyl\Models\ServiceOption;
use Pterodactyl\Exceptions\DisplayException;
@ -39,6 +41,21 @@ use Pterodactyl\Http\Requests\Admin\Service\StoreOptionVariable;
class OptionController extends Controller
{
/**
* Store the repository instance.
*
* @var \Pterodactyl\Repositories\OptionRepository
*/
protected $repository;
/**
* OptionController constructor.
*/
public function __construct()
{
$this->repository = new OptionRepository(Route::current()->parameter('option'));
}
/**
* Handles request to view page for adding new option.
*
@ -227,24 +244,17 @@ class OptionController extends Controller
}
/**
* Handles POST when updating scripts for a service option.
* Handles POST when updating script for a service option.
*
* @param Request $request
* @param int $id
* @return \Illuminate\Response\RedirectResponse
* @param \Pterodactyl\Http\Requests\Admin\Service\EditOptionScript $request
* @return \Illuminate\Http\RedirectResponse
*/
public function updateScripts(Request $request, $id)
public function updateScripts(EditOptionScript $request)
{
$repo = new OptionRepository;
try {
$repo->scripts($id, $request->only([
'script_install', 'script_entry',
'script_container', 'copy_script_from',
]));
$this->repository->scripts($request->normalize());
Alert::success('Successfully updated option scripts to be run when servers are installed.')->flash();
} catch (DisplayValidationException $ex) {
return redirect()->route('admin.services.option.scripts', $id)->withErrors(json_decode($ex->getMessage()));
} catch (DisplayException $ex) {
Alert::danger($ex->getMessage())->flash();
} catch (\Exception $ex) {