Updating the Table Seeders

ARCANESOFT · Sep 24, 2016 · fd43b26 · fd43b26
1 parent a4bd787
commit fd43b26
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Seeds/Foundation/RoleTableSeeder.php b/src/Seeds/Foundation/RoleTableSeeder.php
@@ -27,7 +27,7 @@ public function run()
             ],
             [
                 'name'        => 'Moderator',
-                'description' => 'The moderator role.',
+                'description' => 'The system moderator role.',
                 'is_locked'   => true,
             ],
             [

diff --git a/src/Seeds/Foundation/UserTableSeeder.php b/src/Seeds/Foundation/UserTableSeeder.php
@@ -35,8 +35,6 @@ public function run()
      */
     private function seedAdminUser()
     {
-        /** @var  \Arcanesoft\Auth\Models\Role  $adminRole */
-        $adminRole = Role::admins()->first();
         $adminUser = new User([
             'username'   => 'admin',
             'first_name' => 'Super',
@@ -55,6 +53,8 @@ private function seedAdminUser()
 
         $adminUser->save();
 
+        /** @var  \Arcanesoft\Auth\Models\Role  $adminRole */
+        $adminRole = Role::admin()->first();
         $adminRole->attachUser($adminUser);
     }
 }
diff --git a/src/Seeds/RolesSeeder.php b/src/Seeds/RolesSeeder.php
@@ -4,6 +4,7 @@
 use Arcanesoft\Auth\Models\Permission;
 use Arcanesoft\Auth\Models\Role;
 use Carbon\Carbon;
+use Illuminate\Support\Str;
 
 /**
  * Class     RolesSeeder
@@ -47,7 +48,7 @@ protected function prepareRoles(array $roles)
         $now = Carbon::now();
 
         foreach ($roles as $key => $role) {
-            $roles[$key]['slug']       = str_slug($role['name']);
+            $roles[$key]['slug']       = Str::slug($role['name'], config('arcanesoft.auth.slug-separator', '.'));
             $roles[$key]['is_active']  = isset($role['is_active']) ? $role['is_active'] : true;
             $roles[$key]['is_locked']  = isset($role['is_locked']) ? $role['is_locked'] : true;
             $roles[$key]['created_at'] = $now;
@@ -63,8 +64,7 @@ protected function prepareRoles(array $roles)
     protected function syncAdminRole()
     {
         /** @var \Arcanesoft\Auth\Models\Role $admin */
-        $admin = Role::admins()->first();
-
+        $admin = Role::admin()->first();
         $admin->permissions()->sync(
             Permission::all()->pluck('id')->toArray()
         );