Fix migrations when table prefix is involved #442 (#555)

* Fix migrations when table prefix is involved #442

* Formatting

modules/Installer/Http/Controllers/InstallerController.php

@@ -18,6 +18,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
+use Laracasts\Flash\Flash;
 use Modules\Installer\Services\ConfigService;
 use Modules\Installer\Services\RequirementsService;
 
@@ -196,7 +197,7 @@ class InstallerController extends Controller
             Log::error('Testing db before writing configs failed');
             Log::error($e->getMessage());
 
-            flash()->error($e->getMessage());
+            Flash::error($e->getMessage());
             return redirect(route('installer.step2'))->withInput();
         }
 
@@ -224,7 +225,7 @@ class InstallerController extends Controller
             Log::error('Config files failed to write');
             Log::error($e->getMessage());
 
-            flash()->error($e->getMessage());
+            Flash::error($e->getMessage());
             return redirect(route('installer.step2'))->withInput();
         }
 
@@ -238,7 +239,7 @@ class InstallerController extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
+     * @return mixed
      */
     public function dbsetup(Request $request)
     {
@@ -250,9 +251,9 @@ class InstallerController extends Controller
             $this->seederSvc->syncAllSeeds();
         } catch (QueryException $e) {
             Log::error('Error on db setup: '.$e->getMessage());
-
+            dd($e);
             $this->envSvc->removeConfigFiles();
-            flash()->error($e->getMessage());
+            Flash::error($e->getMessage());
             return redirect(route('installer.step2'))->withInput();
         }
 

modules/Installer/Resources/views/flash/message.blade.php

@@ -1,11 +1,19 @@
-@foreach (session('flash_notification', []) as $message)
-  <div class="alert alert-danger" role="alert">
-    <div class="container">
-      <div class="alert-icon">
-        <i class="now-ui-icons ui-2_like"></i>
-      </div>
-      {{ $message['message'] }}
+@if (session()->has('flash_notification.message'))
+  @if (session()->has('flash_notification.overlay'))
+    @include('flash::modal', [
+        'modalClass' => 'flash-modal',
+        'title'      => session('flash_notification.title'),
+        'body'       => session('flash_notification.message')
+    ])
+  @else
+    <div class="alert
+                    alert-{{ session('flash_notification.level') }}
+    {{ session()->has('flash_notification.important') ? 'alert-important' : '' }}">
+      @if(session()->has('flash_notification.important'))
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+      @endif
+
+      {{ session('flash_notification.message') }}
     </div>
-  </div>
-@endforeach
-{{ session()->forget('flash_notification') }}
+  @endif
+@endif

modules/Installer/Resources/views/install/steps/step1-requirements.blade.php

@@ -12,9 +12,9 @@
         <td>PHP Version: {{ $php['version'] }}</td>
         <td style="text-align:center;">
           @if($php['passed'] === true)
-            <span class="badge badge-success">OK!</span>
+            <span class="badge badge-success">OK</span>
           @else
-            <span class="badge badge-danger">Failed!</span>
+            <span class="badge badge-danger">Failed</span>
           @endif
         </td>
       </tr>
@@ -27,9 +27,9 @@
           <td>{{ $ext['ext'] }}</td>
           <td style="text-align:center;">
             @if($ext['passed'] === true)
-              <span class="badge badge-success">OK!</span>
+              <span class="badge badge-success">OK</span>
             @else
-              <span class="badge badge-danger">Failed!</span>
+              <span class="badge badge-danger">Failed</span>
             @endif
           </td>
         </tr>
@@ -46,9 +46,9 @@
           <td>{{ $dir['dir'] }}</td>
           <td style="text-align:center;">
             @if($dir['passed'] === true)
-              <span class="badge badge-success">OK!</span>
+              <span class="badge badge-success">OK</span>
             @else
-              <span class="badge badge-danger">Failed!</span>
+              <span class="badge badge-danger">Failed</span>
             @endif
           </td>
         </tr>
@@ -59,9 +59,6 @@
         {{ Form::submit('Database Setup >>', ['class' => 'btn btn-success']) }}
       </p>
     @endif
-    {{--{{ $php_version }}
-    {{ $extensions }}
-    {{ $passed }}--}}
     {{ Form::close() }}
   </div>
 @endsection