[FIX] BASE: Employee filter badge count wrong indication
This commit is contained in:
@@ -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}}"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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}}"
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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];
|
||||
|
||||
Reference in New Issue
Block a user