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

Fixup merge

Browse source
This commit is contained in:
Dane Everitt 2017-04-20 17:26:20 -04:00
parent 8d24e5f168
commit c8f1335a09
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
12 changed files with 13 additions and 589 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -233,10 +233,8 @@ class OptionController extends Controller
$repo = new OptionRepository;
try {
$repo->scripts($id, $request->only([
'script_install', 'script_upgrade',
]));
Alert::success('Successfully updated option scripts to be run when servers are installed or updated.')->flash();
$repo->scripts($id, $request->only('script_install'));
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 (\Exception $ex) {

2
app/Http/Controllers/Daemon/OptionController.php
View file

@ -42,7 +42,7 @@ class OptionController extends Controller
return response()->json([
'scripts' => [
'install' => str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_install),
'upgrade' => str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_upgrade),
// 'upgrade' => str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_upgrade),
'privileged' => $server->option->script_is_privileged,
],
'env' => $environment->merge([