Merge branch 'v0.16' into release

ssddanbrown · ssddanbrown · commit 441e46ebaa92 · 2017-06-04T15:38:29.000+01:00
diff --git a/app/Services/PermissionService.php b/app/Services/PermissionService.php
@@ -259,7 +259,7 @@ protected function deleteManyJointPermissionsForRoles($roles)
         $roleIds = array_map(function($role) {
             return $role->id;
         }, $roles);
-        $this->jointPermission->newQuery()->whereIn('id', $roleIds)->delete();
+        $this->jointPermission->newQuery()->whereIn('role_id', $roleIds)->delete();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ protected function deleteManyJointPermissionsForRoles($roles)`
`259`	`259`	`$roleIds = array_map(function($role) {`
`260`	`260`	`return $role->id;`
`261`	`261`	`}, $roles);`
`262`		`- $this->jointPermission->newQuery()->whereIn('id', $roleIds)->delete();`
	`262`	`+ $this->jointPermission->newQuery()->whereIn('role_id', $roleIds)->delete();`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`/**`