Skip to content

Commit c8f1335

Browse files
committed
Fixup merge
1 parent 8d24e5f commit c8f1335

File tree

12 files changed

+13
-589
lines changed

12 files changed

+13
-589
lines changed

.env.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ DB_DATABASE=homestead
1313
DB_USERNAME=homestead
1414
DB_PASSWORD=secret
1515

16-
CACHE_DRIVER=memcached
16+
CACHE_DRIVER=file
1717
SESSION_DRIVER=database
1818

1919
MAIL_DRIVER=smtp

app/Http/Controllers/Admin/OptionController.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,8 @@ public function updateScripts(Request $request, $id)
233233
$repo = new OptionRepository;
234234

235235
try {
236-
$repo->scripts($id, $request->only([
237-
'script_install', 'script_upgrade',
238-
]));
239-
Alert::success('Successfully updated option scripts to be run when servers are installed or updated.')->flash();
236+
$repo->scripts($id, $request->only('script_install'));
237+
Alert::success('Successfully updated option scripts to be run when servers are installed.')->flash();
240238
} catch (DisplayValidationException $ex) {
241239
return redirect()->route('admin.services.option.scripts', $id)->withErrors(json_decode($ex->getMessage()));
242240
} catch (\Exception $ex) {

app/Http/Controllers/Daemon/OptionController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function details(Request $request, $server)
4242
return response()->json([
4343
'scripts' => [
4444
'install' => str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_install),
45-
'upgrade' => str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_upgrade),
45+
// 'upgrade' => str_replace(["\r\n", "\n", "\r"], "\n", $server->option->script_upgrade),
4646
'privileged' => $server->option->script_is_privileged,
4747
],
4848
'env' => $environment->merge([

0 commit comments

Comments
 (0)