sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some forgotten logic checks temporarily

This commit is contained in:
Dane Everitt 2017-09-10 23:57:18 -05:00
parent 97d87ff57c
commit 131159c246
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Admin/AdminFormRequest.php
View File

@ -42,7 +42,7 @@ abstract class AdminFormRequest extends FormRequest
return false; return false;
} }
return $this->user()->isRootAdmin(); return (bool) $this->user()->root_admin;
} }
/** /**

2
app/Models/User.php
View File

@ -202,7 +202,7 @@ class User extends Model implements
*/ */
public function isRootAdmin() public function isRootAdmin()
{ {
return $this->root_admin === 1; return $this->root_admin;
} }
/** /**

2
app/Policies/APIKeyPolicy.php
View File

@ -43,7 +43,7 @@ class APIKeyPolicy
protected function checkPermission(User $user, Key $key, $permission) protected function checkPermission(User $user, Key $key, $permission)
{ {
// Non-administrative users cannot use administrative routes. // Non-administrative users cannot use administrative routes.
if (! starts_with($key, 'user.') && ! $user->isRootAdmin()) { if (! starts_with($key, 'user.') && ! $user->root_admin) {
return false; return false;
} }

2
app/Policies/ServerPolicy.php
View File

@ -60,7 +60,7 @@ class ServerPolicy
*/ */
public function before(User $user, $ability, Server $server) public function before(User $user, $ability, Server $server)
{ {
if ($user->isRootAdmin() || $server->owner_id === $user->id) { if ($user->root_admin || $server->owner_id === $user->id) {
return true; return true;
} }