From cb880006feebdd9e7b91f81157a1fc1c85eedb54 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 7 Jan 2020 12:16:16 +0300
Subject: [PATCH] fixed edit category for nullable ad

---
 .../advs-module/src/Adv/AdvModel.php          | 22 ++++++++++---------
 .../src/Http/Controller/advsController.php    |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index 2270e058e..025aefdc1 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -59,26 +59,28 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
             return true;
     }
 
-    public function getAdv($id = null)
+    public function getAdv($id = null, $nullable_ad = false)
     {
         if ($id != null) {
-            return AdvModel::query()
-                ->where('advs_advs.slug', '!=', "")
-                ->find($id);
+            if ($nullable_ad)
+                return $this->find($id);
+            else
+                $this->where('advs_advs.slug', '!=', "")
+                    ->find($id);
         }
-        return AdvModel::query()
-            ->where('advs_advs.slug', '!=', "");
+        if ($nullable_ad)
+            return $this->newQuery();
+        return $this->where('advs_advs.slug', '!=', "");
     }
 
-    public function userAdv()
+    public function userAdv($nullable_ad = false)
     {
         if (Auth::user()->hasRole('admin')) {
-            return $this->getAdv();
+            return $this->getAdv(null, $nullable_ad);
         } else {
-            return $this->getAdv()
+            return $this->getAdv(null, $nullable_ad)
                 ->where('advs_advs.created_by_id', Auth::id());
         }
-
     }
 
     public function getAdvByCat($cat_id)
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 5aedb1d6f..1df9b5859 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -789,7 +789,7 @@ class AdvsController extends PublicController
             redirect('/login?redirect=' . url()->current())->send();
         }
 
-        $is_ad = $this->adv_model->userAdv($id)->find($id);
+        $is_ad = $this->adv_model->userAdv(true)->find($id);
 
         if (is_null($is_ad)) {
             abort(403);