Merge branch 'test.customwristbands.cz' into dev
This commit is contained in:
@@ -171,7 +171,7 @@ class Content extends Model
|
||||
|
||||
// filter results using handler
|
||||
if ($handler) {
|
||||
$query = $query->where('module_handler', $handler);
|
||||
$query = $query->where('contents.module_handler', $handler);
|
||||
}
|
||||
|
||||
// join user email and user name to results when needed
|
||||
@@ -293,4 +293,4 @@ class Content extends Model
|
||||
{
|
||||
return $this->belongsTo('App\Models\User', 'user_id');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user