From fa60a436722b1c716c433e1e9cfd4b37941cd0fd Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 17 Feb 2020 12:18:53 +0300 Subject: [PATCH] #873 add addBlock params && move old function --- .../advs-module/resources/views/list/list.twig | 2 +- .../advs-module/src/Http/Controller/advsController.php | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index 4bf5abd23..4b3b36139 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -27,7 +27,7 @@ {% include "visiosoft.module.advs::list/partials/display-mode" %} - {{ addBlock('ads-list/row',{'topfields':topfields})|raw }} + {{ addBlock('ads-list/row',{'topfields':topfields,'advs':advs})|raw }}
{% block listContent %} {% include "visiosoft.module.advs::list/partials/ads" %} diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index cf6c6e023..05213b1b3 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -214,14 +214,8 @@ class AdvsController extends PublicController $advs = $this->adv_repository->addAttributes($advs); - if ($isActiveDopings) { - $dopingModel = new DopingModel(); - $featured_advs = $dopingModel->filterAdvs(2, $advs); - - foreach ($featured_advs as $index => $ad) { - $featured_advs[$index]->detail_url = $this->adv_model->getAdvDetailLinkByModel($ad, 'list'); - $featured_advs[$index] = $this->adv_model->AddAdsDefaultCoverImage($ad); - } + if ($isActiveDopings and $param != null) { + $featured_advs = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->listFeatures($advs); } foreach ($advs as $index => $ad) {