DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed error when user has no permissions values

Browse source
This commit is contained in:
snipe 2016-06-02 17:16:22 -07:00
parent 485fb26393
commit 95f94c1cfb
1 changed files with 111 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/Models/User.php
View file

@ -39,7 +39,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
]; ];
// This is very coarse and should be changed
public function hasAccess($section) public function hasAccess($section)
{ {
@ -56,7 +55,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
$user_permissions = json_decode($this->permissions, true); $user_permissions = json_decode($this->permissions, true);
if ((array_key_exists($section, $user_permissions)) && ($user_permissions[$section]=='1')) { if (($user_permissions!='') && ((array_key_exists($section, $user_permissions)) && ($user_permissions[$section]=='1')) ) {
$permitted = true; $permitted = true;
} }
@ -345,14 +344,14 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
return json_decode($this->permissions, true); return json_decode($this->permissions, true);
} }
/** /**
* Query builder scope to search on text * Query builder scope to search on text
* *
* @param Illuminate\Database\Query\Builder $query Query builder instance * @param Illuminate\Database\Query\Builder $query Query builder instance
* @param text $search Search term * @param text $search Search term
* *
* @return Illuminate\Database\Query\Builder Modified query builder * @return Illuminate\Database\Query\Builder Modified query builder
*/ */
public function scopeTextsearch($query, $search) public function scopeTextsearch($query, $search)
{ {