From f1857bf7aab019519d4a0a94d431f502629e21c7 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 14 Feb 2020 11:33:36 +0300 Subject: [PATCH] add with trashed parameter --- .../advs-module/src/Adv/AdvModel.php | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index 942708feb..c04b38d2c 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -59,18 +59,26 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface return 1; } - public function getAdv($id = null, $nullable_ad = false) + public function getAdv($id = null, $nullable_ad = false, $trashed = false) { - if ($id != null) { - if ($nullable_ad) - return $this->find($id); - else - return $this->where('advs_advs.slug', '!=', "") - ->find($id); + $query = $this::query(); + + if ($trashed) { + $query = $this::withTrashed(); } - if ($nullable_ad) - return $this->newQuery(); - return $this->where('advs_advs.slug', '!=', ""); + + if ($id != null) { + if ($nullable_ad) { + return $query->find($id); + } else { + return $query->where('advs_advs.slug', '!=', "") + ->find($id); + } + } + if ($nullable_ad) { + return $query->newQuery(); + } + return $query->where('advs_advs.slug', '!=', ""); } public function userAdv($nullable_ad = false)