From efc1fc06ca512a94ff02ec459fe8a71f176ccc9e Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Thu, 5 Nov 2020 18:16:16 +0300
Subject: [PATCH] fix sort by column

---
 .../Adv/Listeners/AddTableCategoryColumn.php    | 17 -----------------
 .../src/AdvsModuleServiceProvider.php           |  1 -
 .../Http/Controller/Admin/AdvsController.php    |  3 +--
 3 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 addons/default/visiosoft/advs-module/src/Adv/Listeners/AddTableCategoryColumn.php

diff --git a/addons/default/visiosoft/advs-module/src/Adv/Listeners/AddTableCategoryColumn.php b/addons/default/visiosoft/advs-module/src/Adv/Listeners/AddTableCategoryColumn.php
deleted file mode 100644
index 9c0a8196b..000000000
--- a/addons/default/visiosoft/advs-module/src/Adv/Listeners/AddTableCategoryColumn.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php namespace Visiosoft\AdvsModule\Adv\Listeners;
-
-use Anomaly\Streams\Platform\Ui\Table\Event\TableIsQuerying;
-
-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');
-//        }
-    }
-}
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index d3878b0df..3fd214124 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -221,7 +221,6 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
     protected $listeners = [
         TableIsQuerying::class => [
             AddAdvsSettingsScript::class,
-            AddTableCategoryColumn::class,
         ],
     ];
 
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 af93a710c..d865a67dc 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,13 +153,12 @@ class AdvsController extends AdminController
                 }
             ],
             'category' => [
+                'sort_column' => 'cat1',
                 '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',
         ]);