Bug fixed

MichaelAndish · Jul 10, 2019 · 4556a18 · 4556a18
1 parent 02d9b0f
commit 4556a18
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 40 deletions.
diff --git a/src/Database/Seeders/Permission/MasterPermissionTableSeeder.php b/src/Database/Seeders/Permission/MasterPermissionTableSeeder.php
@@ -59,9 +59,6 @@ public function run()
                         'name'          => array_keys($rolePermissions)[0],
                         'guard_name'    => $guard
                     ]);
-                    // $permObject = Permission::where('name', array_keys($rolePermissions)[0] )
-                    //     ->where('guard_name',$guard)
-                    //     ->first();
                     $permObject->syncRoles( $this->getRolesID($rolePermissions[array_keys($rolePermissions)[0]],$guard) );
                 }
 
@@ -90,7 +87,6 @@ public function run()
                 {
                     $this->command->info('  THIS PERMISSION <<' . $perm . ' >> ASSIGNED TO THESE ROLES <<<< '. implode(' - ', $roles) . ' >>> GUARD NAME = ' . $this->guardName);
                     $permObject = $this->permissionRepository->findBy(['name' => $perm]);
-                    // $permObject = Permission::where('name',$perm)->first();
                     $permObject->syncRoles( $this->getRolesID($roles,$this->guardName) );
                 }
 
@@ -116,8 +112,6 @@ private function setPermissions(array $permission , $guard = null)
             'name'      => $permission['name'],
             'guard_name'=> $getGuard
         ]);
-        // $getPermission  = Permission::where('name',$permission['name'])
-            // ->where('guard_name',$getGuard)->first();
 
         if (! is_null($getPermission))
         {
@@ -130,13 +124,6 @@ private function setPermissions(array $permission , $guard = null)
                 'module'        => isset($permission['module']) ? $permission['module'] : null ,
                 'description'   => isset($permission['description']) ? $permission['description'] : null ,                
             ]);
-            // $getPermission->update([
-            //     'name'          => $permission['name'],
-            //     'guard_name'    => $guard ?? $permission['guard_name'],
-            //     'title'         => isset($permission['title']) ? $permission['title'] : null ,
-            //     'module'        => isset($permission['module']) ? $permission['module'] : null ,
-            //     'description'   => isset($permission['description']) ? $permission['description'] : null ,
-            // ]);
 
             $rolePermissions[$permission['name']] = array_values($permission['roles']) ?? null ;
 
@@ -153,14 +140,6 @@ private function setPermissions(array $permission , $guard = null)
             'description'   => isset($permission['description']) ? $permission['description'] : null ,            
         ]);
 
-        // Permission::create([
-        //     'name'          => $permission['name'],
-        //     'guard_name'    => $getGuard,
-        //     'title'         => isset($permission['title']) ? $permission['title'] : null ,
-        //     'module'        => isset($permission['module']) ? $permission['module'] : null ,
-        //     'description'   => isset($permission['description']) ? $permission['description'] : null ,
-        // ]);
-
         $rolePermissions[$permission['name']] = array_values($permission['roles']) ?? null ;
 
         return $rolePermissions;
@@ -172,7 +151,6 @@ private function getRolesID(array $roles, $guard)
         $roleIDs    = array();
         foreach ($roles as $role)
         {
-            // $roleIDs[] = optional(Role::where('name', $role)->where('guard_name', $guard)->first())->id;
             $findRole = $this->roleRepository->findBy([
                 'name'       => $role,
                 'guard_name' => $guard

diff --git a/src/Database/Seeders/Role/MasterRoleTableSeeder.php b/src/Database/Seeders/Role/MasterRoleTableSeeder.php
@@ -37,9 +37,6 @@ public function run()
 
         foreach ($this->getRoles() as $role)
         {
-            // $findRole = Role::where('name',$role['name'])
-            //     ->where('guard_name',$role['guard_name'])
-            //     ->first();
             $findRole = $this->roleRepository->findBy([
                 'name'       => $role['name'],
                 'guard_name' => $role['guard_name']
@@ -51,16 +48,10 @@ public function run()
 
                 $this->roleRepository->update($findRole->id,[
                     'name'          => $role['name'],
-                    'display_name'  => $role['display_name'],
+                    'title'         => $role['title'],
                     'guard_name'    => $role['guard_name'],
                     'description'   => isset($role['description']) ? $role['description'] : null,
                 ]);
-                // $findRole->update([
-                //     'name'          => $role['name'],
-                //     'display_name'  => $role['display_name'],
-                //     'guard_name'    => $role['guard_name'],
-                //     'description'   => isset($role['description']) ? $role['description'] : null,
-                // ]);
 
                 continue;
             }
@@ -69,16 +60,10 @@ public function run()
 
             $this->roleRepository->store([
                 'name'          => $role['name'],
-                'display_name'  => $role['display_name'],
+                'title'         => $role['title'],
                 'guard_name'    => $role['guard_name'],
                 'description'   => isset($role['description']) ? $role['description'] : null,
             ]);
-            // Role::create([
-            //     'name'          => $role['name'],
-            //     'display_name'  => $role['display_name'],
-            //     'guard_name'    => $role['guard_name'],
-            //     'description'   => isset($role['description']) ? $role['description'] : null,
-            // ]);
 
         }
 

diff --git a/src/Database/Seeders/Role/RoleTableSeeder.php b/src/Database/Seeders/Role/RoleTableSeeder.php
@@ -4,7 +4,7 @@
 use Mekaeil\LaravelUserManagement\seeders\Permission\MasterRoleTableSeeder;
 class RoleTableSeeder extends MasterRoleTableSeeder
 {
-    protected $permissions = [
+    protected $roles = [
         [
             'name'          => "Admin",
             'title'         => "Administrator",