Merge pull request #196 from Prophet731/develop

Fixed setup errors
AdKats · May 9, 2016 · 4672ae9 · 4672ae9
2 parents 3d260b6 + 8b7c66d
commit 4672ae9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/app/database/migrations/2016_01_02_173641_add_russian_language.php b/app/database/migrations/2016_01_02_173641_add_russian_language.php
@@ -5,14 +5,21 @@
 
 class AddRussianLanguage extends Migration
 {
-
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
     {
+        if (Option::count() == 0) {
+            if (! defined('FIRST_RUN')) {
+                define('FIRST_RUN', true);
+            }
+
+            return;
+        }
+
         $setting = Option::setting('site.languages')->first();
 
         $keys = explode(',', $setting->option_value);

diff --git a/app/database/migrations/2016_01_06_002532_add_pusher_permission.php b/app/database/migrations/2016_01_06_002532_add_pusher_permission.php
@@ -7,14 +7,21 @@
 
 class AddPusherPermission extends Migration
 {
-
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
     {
+        if (Permission::count() == 0) {
+            if (! defined('FIRST_RUN')) {
+                define('FIRST_RUN', true);
+            }
+
+            return;
+        }
+
         $now = Carbon::now();
 
         $permissions = [

diff --git a/app/database/seeds/DatabaseSeeder.php b/app/database/seeds/DatabaseSeeder.php
@@ -2,7 +2,6 @@
 
 class DatabaseSeeder extends Seeder
 {
-
     /**
      * Run the database seeds.
      *
@@ -19,7 +18,11 @@ public function run()
         $this->call('PermissionsTableSeeder');
         $this->call('UserTableSeeder');
 
+        if (defined('FIRST_RUN')) {
+            DB::delete("DELETE FROM `bfacp_migrations` WHERE `migration` IN ('2016_01_02_173641_add_russian_language', '2016_01_06_002532_add_pusher_permission')");
+            Artisan::call('migrate', ['--force' => true]);
+        }
+
         DB::statement('SET FOREIGN_KEY_CHECKS=1');
     }
-
 }