Merge pull request #174 from cuneytsenturk/master

Attachment manager
This commit is contained in:
Cüneyt Şentürk
2018-01-09 02:02:38 +03:00
committed by GitHub
57 changed files with 1398 additions and 167 deletions

View File

@ -11,12 +11,13 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Laratrust\Traits\LaratrustUserTrait;
use Kyslik\ColumnSortable\Sortable;
use Plank\Mediable\Mediable;
use Request;
use Route;
class User extends Authenticatable
{
use Filterable, LaratrustUserTrait, Notifiable, SoftDeletes, Sortable;
use Filterable, LaratrustUserTrait, Notifiable, SoftDeletes, Sortable, Mediable;
protected $table = 'users';
@ -25,7 +26,7 @@ class User extends Authenticatable
*
* @var array
*/
protected $fillable = ['name', 'email', 'password', 'locale', 'picture', 'enabled'];
protected $fillable = ['name', 'email', 'password', 'locale', 'enabled'];
/**
* The attributes that should be hidden for arrays.
@ -87,7 +88,15 @@ class User extends Authenticatable
}
}
return $value;
if (!empty($value)) {
return $value;
}
if (!$this->hasMedia('picture')) {
return false;
}
return $this->getMedia('picture')->last();
}
/**