Merge pull request #68 from jeremykenedy/jeremykenedy-patch-1

jeremykenedy · web-flow · commit 585519331449 · 2019-07-31T00:19:06.000-07:00
Update HasRoleAndPermission.php
diff --git a/src/Traits/HasRoleAndPermission.php b/src/Traits/HasRoleAndPermission.php
@@ -204,7 +204,7 @@ public function rolePermissions()
             ->join('roles', 'roles.id', '=', 'permission_role.role_id')
             ->whereIn('roles.id', $this->getRoles()->pluck('id')->toArray())
             ->orWhere('roles.level', '<', $this->level())
-            ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'pivot_created_at', 'pivot_updated_at']);
+            ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'permissions.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public function rolePermissions()`
`204`	`204`	`->join('roles', 'roles.id', '=', 'permission_role.role_id')`
`205`	`205`	`->whereIn('roles.id', $this->getRoles()->pluck('id')->toArray())`
`206`	`206`	`->orWhere('roles.level', '<', $this->level())`
`207`		`- ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'pivot_created_at', 'pivot_updated_at']);`
	`207`	`+ ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'permissions.deleted_at', 'pivot_created_at', 'pivot_updated_at']);`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/**`