fix laravel 5.1

recca0120 · Jul 11, 2016 · 4abbc2d · 4abbc2d
1 parent 9169ccb
commit 4abbc2d
Show file tree

Hide file tree

Showing 3 changed files with 281 additions and 43 deletions.
diff --git a/resources/views/panel.blade.php b/resources/views/panel.blade.php
@@ -1,6 +1,3 @@
-@php
-    $id = str_random(30);
-@endphp
 <div id="panel-terminal-shell-{{ $id }}" class="terminal-panel"></div>
 <script>
 (function() {

diff --git a/src/Http/Controllers/TerminalController.php b/src/Http/Controllers/TerminalController.php
@@ -40,12 +40,8 @@ public function __construct(ConsoleKernel $consoleKernel)
      *
      * @return mixed
      */
-    public function index(
-        ApplicationContract $app,
-        SessionManager $sessionManager,
-        Request $request,
-        $view = 'index'
-    ) {
+    public function index(ApplicationContract $app, SessionManager $sessionManager, Request $request, $view = 'index')
+    {
         $session = $sessionManager->driver();
         if ($session->isStarted() === false) {
             $session->setId($request->cookies->get($session->getName()));
@@ -79,8 +75,9 @@ public function index(
                 ],
             ],
         ]);
+        $id = ($view === 'panel') ? str_random(30) : null;
 
-        return view('terminal::'.$view, compact('options', 'resources'));
+        return view('terminal::'.$view, compact('options', 'resources', 'id'));
     }
 
     /**