From 4bbd350e32f146be12cfc01822ea3ca5089439c4 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 23 May 2018 13:41:56 +0200 Subject: [PATCH] Fix groups browsing --- Changelog | 1 + app/Http/Controllers/BrowseController.php | 32 ++++++++++++++++++----- resources/views/themes/Gentele/browse.tpl | 4 +-- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/Changelog b/Changelog index f30de448b..6bf0ff2be 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-05-23 DariusIII + * Fix: Fix groups browsing * Chg: Don't use pagination for groups list page * Fix: Fix Admin/AnidbController edit function * Fix: Fix anidb-edit link diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index 3f9c31ca4..5617a9527 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -8,11 +8,6 @@ use Illuminate\Http\Request; class BrowseController extends BasePageController { - public function __construct(Request $request) - { - parent::__construct($request); - } - /** * @throws \Exception */ @@ -34,7 +29,16 @@ class BrowseController extends BasePageController $this->smarty->assign('lastvisit', $this->userdata['lastlogin']); - $this->smarty->assign('results', $results); + foreach ($results as $result) { + $browse[] = $result; + } + + $this->smarty->assign( + [ + 'results' => $results, + 'resultsadd' => $browse + ] + ); $meta_title = 'Browse All Releases'; $meta_keywords = 'browse,nzb,description,details'; @@ -163,7 +167,21 @@ class BrowseController extends BasePageController $offset = ($page - 1) * config('nntmux.items_per_page'); $rslt = $releases->getBrowseRange($page, [-1], $offset, config('nntmux.items_per_page'), '', -1, $this->userdata['categoryexclusions'], $group); $results = $this->paginate($rslt ?? [], $rslt[0]->_totalcount ?? 0, config('nntmux.items_per_page'), $page, request()->url(), request()->query()); - $this->smarty->assign('results', $results); + + $browse = []; + + foreach ($results as $result) { + $browse[] = $result; + } + + $this->smarty->assign( + [ + 'results' => $results, + 'resultsadd' => $browse, + 'parentcat' => $group, + 'catname' => 'all', + ] + ); $meta_title = 'Browse Groups'; $meta_keywords = 'browse,nzb,description,details'; $meta_description = 'Browse Groups'; diff --git a/resources/views/themes/Gentele/browse.tpl b/resources/views/themes/Gentele/browse.tpl index 98a62157d..88b799993 100755 --- a/resources/views/themes/Gentele/browse.tpl +++ b/resources/views/themes/Gentele/browse.tpl @@ -3,8 +3,8 @@