Merge pull request #862 from DimalChandrasiri/master

Fixing the issue where bulk actions are shown without bulk action getting triggered in cloud
revert-70aa11f8
Kamidu Sachith Punchihewa 7 years ago committed by GitHub
commit 18cf92dc40

@ -176,7 +176,7 @@
<th data-for="By Ownership" class="select-filter"></th>
<th class="no-sort"></th>
</tr>
<tr class="bulk-action-row">
<tr class="bulk-action-row hidden">
<th colspan="7">
<ul class="tiles">
{{#unless group}}

@ -138,7 +138,7 @@
<th data-for="By Status" class="select-filter"></th>
<th class="no-sort"></th>
</tr>
<tr class="bulk-action-row">
<tr class="bulk-action-row hidden">
<th colspan="9">
<ul class="tiles">
{{#if removePermitted}}

@ -77,7 +77,7 @@
<tr class="sort-row">
<th>By Username</th>
</tr>
<tr class="bulk-action-row">
<tr class="bulk-action-row hidden">
<th colspan="3">
<ul class="tiles">
<li class="square">

@ -285,6 +285,7 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
$(document).off('click', '.viewEnabledIcon');
//--- End of EMM related codes
} else if ($(button).html() == 'Cancel') {
$('.bulk-action-row').addClass('hidden');
thisTable.removeClass("table-selectable");
$(button).addClass("active").html('Select');
$(button).parent().next().children().addClass("disabled");
@ -322,6 +323,11 @@ $.fn.datatables_extended_serverside_paging = function (settings, url, dataFilter
$('body').on('click', '[data-type=selectable]', function () {
var rowSelectedClass = 'DTTT_selected selected';
$(this).toggleClass(rowSelectedClass);
if ($('.table-selectable .DTTT_selected').length > 0) {
$('.bulk-action-row').removeClass('hidden');
} else {
$('.bulk-action-row').addClass('hidden');
}
var button = this,
thisTable = $(this).closest('.dataTables_wrapper').find('.dataTable').dataTable();

Loading…
Cancel
Save