Skip to content

Commit 311bbbc

Browse files
committed
Merge remote-tracking branch 'pevogam/html-results-negative-search'
Signed-off-by: Cleber Rosa <crosa@redhat.com>
2 parents 8206f0d + 43401d2 commit 311bbbc

File tree

5 files changed

+539
-617
lines changed

5 files changed

+539
-617
lines changed

optional_plugins/html/avocado_result_html/templates/avocado_html.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,17 @@
1313

1414
function onDatatablesInitialized() {
1515
var statusColumn = this.api().column(4);
16-
var select = $('<select class="form-control input-sm"><option value="">ALL</option></select>')
16+
var select = $('<select id="dt-status-0" class="form-control input-sm"><option value="">ALL</option></select>')
1717
.on('change', function () {
1818
statusColumn.search($(this).val().trim()).draw();
1919
});
2020

21-
$('#results_length').wrap('<div class="row"><div class="col-sm-4"></div></div>');
22-
$('#results_length').parent().parent()
21+
$('#dt-length-0').parent().parent()
2322
.append(
24-
$('<div class="col-sm-8"></div>')
23+
$('<div class="dt-search"></div>')
2524
.append(
26-
$('<label class="font-weight-normal">Status </label>').append(select)
27-
)
25+
$('<label for="dt-status-0" style="margin-right: 0.5em;">Status:</label>')
26+
).append(select)
2827
);
2928

3029
// Add all possible status to the select
@@ -78,8 +77,12 @@
7877
// this should be called each table we have a redrawn
7978
this.setupResizers = function() {
8079
var self = this;
81-
table.find('.resizer').each(function() {
82-
var resizerElement = $(this);
80+
table.find('th').each(function() {
81+
if ($(this).find('.resizer').length == 0) {
82+
// we only need one resizer per header cell
83+
$(this).append('<div class="resizer"></div>')
84+
}
85+
var resizerElement = $(this).find('.resizer');
8386
// the resizer must have the same size as the header cell to be detectable
8487
resizerElement.height(resizerElement.parent().outerHeight())
8588
// we detach and reattach each event to prevent them from being triggered

optional_plugins/html/avocado_result_html/templates/datatables.bootstrap.js

Lines changed: 0 additions & 186 deletions
This file was deleted.

0 commit comments

Comments
 (0)