From c461700589200549671bfde8fd42ec8ed07dcbba Mon Sep 17 00:00:00 2001
From: BrettonYe <monkeyblacktech97@gmail.com>
Date: Mon, 15 Jul 2024 20:52:03 +0800
Subject: [PATCH] Fixed Logo do not show correctly when it's empty

Clean query when submit filters
---
 resources/views/admin/article/index.blade.php |  2 +-
 resources/views/admin/article/show.blade.php  |  9 +++++++--
 resources/views/admin/table_layouts.blade.php | 12 ++++++++++--
 resources/views/user/knowledge.blade.php      |  4 ++--
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/resources/views/admin/article/index.blade.php b/resources/views/admin/article/index.blade.php
index d30b43d3..cec47792 100644
--- a/resources/views/admin/article/index.blade.php
+++ b/resources/views/admin/article/index.blade.php
@@ -76,7 +76,7 @@
                                     {{ Str::limit($article->category, 30) }}
                                 </td>
                                 <td class="text-left">
-                                    @if (! empty($article->logo))
+                                    @if ($article->logo)
                                         <img class="mr-5" src="{{ asset($article->logo) }}" alt="logo" style="height: 32px" loading="lazy" />
                                     @endif
                                     {{ Str::limit($article->title, 50) }}
diff --git a/resources/views/admin/article/show.blade.php b/resources/views/admin/article/show.blade.php
index 317ebdd4..e1fefd63 100644
--- a/resources/views/admin/article/show.blade.php
+++ b/resources/views/admin/article/show.blade.php
@@ -11,8 +11,13 @@
                 <div class="panel">
                     <div class="panel-heading">
                         <h3 class="panel-title">
-                            <img class="mr-10" src="{{ asset($article->logo) }}" alt="logo" style="height: 32px" />{{ $article->title }}
-                            {!! $article->category ? '<sub class="ml-20">' . $article->category . '</sub>' : '' !!}
+                            @if ($article->logo)
+                                <img class="mr-10" src="{{ asset($article->logo) }}" alt="logo" style="height: 32px" />
+                            @endif
+                            {{ $article->title }}
+                            @if ($article->category)
+                                <sub class="ml-20">{{ $article->category }}</sub>
+                            @endif
                         </h3>
                         <div class="panel-actions"><code>{{ $article->created_at }}</code></div>
                     </div>
diff --git a/resources/views/admin/table_layouts.blade.php b/resources/views/admin/table_layouts.blade.php
index 8833c038..c7bac58a 100644
--- a/resources/views/admin/table_layouts.blade.php
+++ b/resources/views/admin/table_layouts.blade.php
@@ -10,9 +10,17 @@
     <script src="/assets/global/vendor/bootstrap-select/bootstrap-select.min.js"></script>
     <script src="/assets/global/js/Plugin/bootstrap-select.js"></script>
     <script>
+        $('form').on('submit', function() {
+            $(this).find('input, select').each(function() {
+                if (!$(this).val()) {
+                    $(this).remove();
+                }
+            });
+        });
+
         $('select').on('change', function() {
-            this.form.submit()
-        })
+            $(this).closest('form').trigger('submit');
+        });
     </script>
     @stack('javascript')
 @endsection
diff --git a/resources/views/user/knowledge.blade.php b/resources/views/user/knowledge.blade.php
index 0a55cb2c..e60ce7d6 100644
--- a/resources/views/user/knowledge.blade.php
+++ b/resources/views/user/knowledge.blade.php
@@ -99,10 +99,10 @@
                                                         <a class="panel-title collapsed" data-toggle="collapse" href="#article_A{{ $article->id }}"
                                                            role="tab" aria-controls="article_A{{ $article->id }}" aria-expanded="false"
                                                            style="display: flex;" onclick="getArticle('{{ $article->id }}')">
-                                                            @isset($article->logo)
+                                                            @if ($article->logo)
                                                                 <img class="mr-5" src="{{ asset($article->logo) }}" alt=""
                                                                      style="height: 36px; align-self: center" loading="lazy" />
-                                                            @endisset
+                                                            @endif
                                                             <h4 style="margin-top: 11px">{{ $article->title }}</h4>
                                                         </a>
                                                         <div class="panel-collapse collapse" id="article_A{{ $article->id }}" role="tabpanel"