MAINTENANCE: update laravel, dependencies, fix few bugs

2017-09-13 14:02:39 +02:00
parent 3fdae2669b
commit 422339b313
15 changed files with 801 additions and 5168 deletions
@@ -106,15 +106,15 @@ class Content extends Repository implements IContent
     */
    public function getOverview($handler = null, $statuses = null)
    {
-        $query = ContentModel::select('contents.*', 'modules.name AS module_name', 'modules.id AS module_id')
+        $query = ContentModel::select('contents.*')
                             ->join('modules', 'modules.handler', '=', 'contents.moduleHandler')
                             ->join('users', 'users.id', '=', 'contents.userId')
-                             ->addSelect(DB::raw('COALESCE(users.name, users.email) AS author_name'))
-                             ->addSelect('users.email AS author_email')
                             ->whereNull('contents.deleted_at')
+                             ->whereNull('contents.parentId')
                             ->where('contents.language', LaravelLocalization::getCurrentLocale())
                             ->where('modules.enabled', 1)
-                             ->with('module')
+                             ->with('module', 'subpages', 'templateModel')
+                             ->orderBy('contents.order')
                             ->orderBy('contents.created_at', 'DESC');

        // filter results using handler