Merge

skolehjem/database/seeds/DatabaseSeeder.php

@@ -12,5 +12,6 @@ class DatabaseSeeder extends Seeder
     public function run()
     {
          $this->call(PermissionSeeder::class);
+         $this->call(UserSeeder::class);
     }
 }

skolehjem/database/seeds/PermissionSeeder.php

@@ -40,19 +40,29 @@ class PermissionSeeder extends Seeder
             "link.external.edit" => "Allows editing of external links.",
             "link.external.delete" => "Allows deletion of external links",
 
+            "event.create" => "Create a new event",
+            "event.list" => "Shows all events",
+            "event.show" => "Shows event",
+            "event.edit" => "Edit event",
+            "event.delete" => "Deletes an event",
 
+            "contact.create" => "Creates a new contact",
+            "contact.list" => ""
         ];
 
         foreach ($permissions as $key => $value) {
-            if(Permission::findByName($key))
-                continue;
 
-            $permission = new Permission();
+            try {
+                if(Permission::findByName($key))
+                    continue;
+            } catch (Exception $e) {
+                $permission = new Permission();
 
-            $permission->name = $key;
-            $permission->description = $value;
+                $permission->name = $key;
+                $permission->description = $value;
 
-            $permission->save();
+                $permission->save();
+            }
         }
     }
 }