From 6d23463ec554879b17cdcbf8e884f1f99d88288c Mon Sep 17 00:00:00 2001 From: DariusIII Date: Fri, 15 Mar 2019 11:50:58 +0100 Subject: [PATCH] Fix missed renames for root_categories table --- Blacklight/Releases.php | 2 +- Changelog | 1 + app/Http/Controllers/Admin/CategoryRegexesController.php | 2 +- app/Models/Release.php | 6 +++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Blacklight/Releases.php b/Blacklight/Releases.php index afb73c0c0..f874f995e 100755 --- a/Blacklight/Releases.php +++ b/Blacklight/Releases.php @@ -263,7 +263,7 @@ class Releases extends Release ->select(['r.searchname', 'r.guid', 'g.name as gname', DB::raw("CONCAT(cp.title,'_',c.title) AS catName")]) ->from('releases as r') ->leftJoin('categories as c', 'c.id', '=', 'r.categories_id') - ->leftJoin('categories as cp', 'cp.id', '=', 'c.root_categories_id') + ->leftJoin('root_categories as cp', 'cp.id', '=', 'c.root_categories_id') ->leftJoin('usenet_groups as g', 'g.id', '=', 'r.groups_id'); if ($groupID !== '') { diff --git a/Changelog b/Changelog index ca4e3e638..b9bf783ac 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-03-15 DariusIII + * Fix: Fix missed renames for root_categories table * Chg: Update phpstan/phpstan (0.11.3 => 0.11.4) 2019-03-14 DariusIII * Chg: Use function to delete releases with bad or missing nzbs diff --git a/app/Http/Controllers/Admin/CategoryRegexesController.php b/app/Http/Controllers/Admin/CategoryRegexesController.php index e9b5b37d0..0a486c96a 100644 --- a/app/Http/Controllers/Admin/CategoryRegexesController.php +++ b/app/Http/Controllers/Admin/CategoryRegexesController.php @@ -107,7 +107,7 @@ class CategoryRegexesController extends BasePageController $categories_db = Category::query() ->select(['c.id', 'c.title', 'cp.title as parent_title']) ->from('categories as c') - ->join('categories as cp', 'c.root_categories_id', '=', 'cp.id') + ->join('root_categories as cp', 'c.root_categories_id', '=', 'cp.id') ->whereNotNull('c.root_categories_id') ->orderBy('c.id') ->get(); diff --git a/app/Models/Release.php b/app/Models/Release.php index bda754bcf..6892d708b 100644 --- a/app/Models/Release.php +++ b/app/Models/Release.php @@ -453,7 +453,7 @@ class Release extends Model ] ) ->leftJoin('categories as c', 'c.id', '=', 'releases.categories_id') - ->leftJoin('categories as cp', 'cp.id', '=', 'c.root_categories_id') + ->leftJoin('root_categories as cp', 'cp.id', '=', 'c.root_categories_id') ->orderByDesc('releases.postdate') ->paginate(config('nntmux.items_per_page')); } @@ -499,7 +499,7 @@ class Release extends Model ) ->leftJoin('usenet_groups as g', 'g.id', '=', 'releases.groups_id') ->leftJoin('categories as c', 'c.id', '=', 'releases.categories_id') - ->leftJoin('categories as cp', 'cp.id', '=', 'c.root_categories_id') + ->leftJoin('root_categories as cp', 'cp.id', '=', 'c.root_categories_id') ->leftJoin('videos as v', 'v.id', '=', 'releases.videos_id') ->leftJoin('tv_info as tvi', 'tvi.videos_id', '=', 'releases.videos_id') ->leftJoin('tv_episodes as tve', 'tve.id', '=', 'releases.tv_episodes_id') @@ -532,7 +532,7 @@ class Release extends Model ->select(['name', 'searchname', 'size', 'guid', 'totalpart', 'postdate', 'adddate', 'grabs', 'cp.title as parent_category', 'c.title as sub_category', DB::raw("CONCAT(cp.title, ' > ', c.title) AS category_name")]) ->rightJoin('dnzb_failures', 'dnzb_failures.release_id', '=', 'releases.id') ->leftJoin('categories as c', 'c.id', '=', 'releases.categories_id') - ->leftJoin('categories as cp', 'cp.id', '=', 'c.root_categories_id') + ->leftJoin('root_categories as cp', 'cp.id', '=', 'c.root_categories_id') ->orderBy('postdate', 'desc'); return $failedList->paginate(config('nntmux.items_per_page'));