From 2d2baa343c23ccf5f99579ae285202fe07b69256 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Thu, 5 Nov 2020 18:11:10 +0300
Subject: [PATCH] revert due to error (ambiguous columns)

---
 .../src/Adv/Listeners/AddTableCategoryColumn.php   | 14 +++++++-------
 .../src/Http/Controller/Admin/AdvsController.php   |  9 +++++++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/Listeners/AddTableCategoryColumn.php b/addons/default/visiosoft/advs-module/src/Adv/Listeners/AddTableCategoryColumn.php
index 2191843e0..9c0a8196b 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Listeners/AddTableCategoryColumn.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Listeners/AddTableCategoryColumn.php
@@ -6,12 +6,12 @@ class AddTableCategoryColumn
 {
     public function handle(TableIsQuerying $event)
     {
-        $query = $event->getQuery();
-        $builder = $event->getBuilder();
-
-        if ($builder->getModel() === "Visiosoft\AdvsModule\Adv\AdvModel") {
-            $query->join('cats_category_translations as cats_trans', 'advs_advs.cat1', '=', 'cats_trans.entry_id')
-                ->select('advs_advs.*', 'cats_trans.name as cat');
-        }
+//        $query = $event->getQuery();
+//        $builder = $event->getBuilder();
+//
+//        if ($builder->getModel() === "Visiosoft\AdvsModule\Adv\AdvModel") {
+//            $query->join('cats_category_translations as cats_trans', 'advs_advs.cat1', '=', 'cats_trans.entry_id')
+//                ->select('advs_advs.*', 'cats_trans.name as cat');
+//        }
     }
 }
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php
index 780e7eb19..af93a710c 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php
@@ -153,8 +153,13 @@ class AdvsController extends AdminController
                 }
             ],
             'category' => [
-                'sort_column' => 'cat',
-                'value' => 'entry.cat'
+                'value' => function (EntryInterface $entry, CategoryModel $categoryModel) {
+                    $category = $categoryModel->getCat($entry->cat1);
+                    if (!is_null($category))
+                        return $category->name;
+                }
+//                'sort_column' => 'cat',
+//                'value' => 'entry.cat'
             ],
             'finish_at',
         ]);