From a8af8b78ef4b1b57809023a77055ebccb3971f20 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Fri, 14 Jun 2024 10:48:36 +0530
Subject: [PATCH] [FIX] BASE: Employee filter badge count wrong indication

---
 horilla_views/templates/generic/group_by.html     | 2 +-
 horilla_views/templates/generic/horilla_card.html | 2 +-
 horilla_views/templates/generic/horilla_list.html | 2 +-
 horilla_views/templates/generic/horilla_nav.html  | 4 ++--
 templates/sidebar.html                            | 3 ++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/horilla_views/templates/generic/group_by.html b/horilla_views/templates/generic/group_by.html
index ef763b7ea..84ec53d15 100644
--- a/horilla_views/templates/generic/group_by.html
+++ b/horilla_views/templates/generic/group_by.html
@@ -10,7 +10,7 @@
         reloadSelectedCount($('#count_{{view_id|safe}}'));
         "
         style="cursor: pointer;">
-        {% trans "Select All" %}{{select_all_path}}
+        {% trans "Select All" %} {{queryset.paginator.count}}
       </div>
       <div
       id="unselect_{{view_id}}"
diff --git a/horilla_views/templates/generic/horilla_card.html b/horilla_views/templates/generic/horilla_card.html
index b04cf531a..2c232c7c9 100644
--- a/horilla_views/templates/generic/horilla_card.html
+++ b/horilla_views/templates/generic/horilla_card.html
@@ -49,7 +49,7 @@
             <ul class="oh-dropdown__items">
                 {% for action in actions %}
                 <li class="oh-dropdown__item">
-                  <a {{action.attrs|format:instance|safe}}>{{action.action}}</a>
+                  <a {{action.attrs|format:instance|safe}}>{{instance|getattribute:action.action|default:action.action}}</a>
                 </li>
                 {% endfor %}
             </ul>
diff --git a/horilla_views/templates/generic/horilla_list.html b/horilla_views/templates/generic/horilla_list.html
index 76b5e0541..8becf9257 100644
--- a/horilla_views/templates/generic/horilla_list.html
+++ b/horilla_views/templates/generic/horilla_list.html
@@ -14,7 +14,7 @@
         reloadSelectedCount($('#count_{{view_id|safe}}'));
         "
         style="cursor: pointer;">
-        {% trans "Select All" %}{{select_all_path}}
+        {% trans "Select All" %} {{queryset.paginator.count}}
       </div>
       <div
       id="unselect_{{view_id}}"
diff --git a/horilla_views/templates/generic/horilla_nav.html b/horilla_views/templates/generic/horilla_nav.html
index b0ed21086..ab1d23e25 100644
--- a/horilla_views/templates/generic/horilla_nav.html
+++ b/horilla_views/templates/generic/horilla_nav.html
@@ -100,7 +100,7 @@
             <button
              type="submit"
              id="applyFilter"
-             onclick="filterFormSubmit('filterForm')"
+             onclick="filterCountUpdate('filterForm')"
              class="oh-btn oh-btn--secondary oh-btn--small w-100">
               {% trans "Filter" %}
             </button>
@@ -214,7 +214,7 @@
 </section>
 <div id="filterTagContainerSectionNav"  class="oh-titlebar-container__filters mb-2 mt-0 oh-wrapper"></div>
 <script>
-  filterFormSubmit("filterForm")
+  filterCountUpdate("filterForm")
   $(document).ready(function () {
     $("#filterForm select").select2("destroy")
     $("#filterForm select").parent().find("span").remove()
diff --git a/templates/sidebar.html b/templates/sidebar.html
index dec974d00..878003cd2 100755
--- a/templates/sidebar.html
+++ b/templates/sidebar.html
@@ -468,9 +468,10 @@ function initializeSummernote(candId,searchWords,) {
     $(this).closest("form").submit();
   }
 
-  function filterFormSubmit(formId) {
+  function filterCountUpdate(formId) {
     var formData = $("#" + formId).serialize();
     var count = 0;
+    console.log(formData)
     formData.split("&").forEach(function (field) {
       var parts = field.split("=");
       var value = parts[1];