Filtering bugfixes
This commit is contained in:
parent
1d05cfa0af
commit
be3b954716
File diff suppressed because one or more lines are too long
@ -80,10 +80,11 @@
|
|||||||
<span>Search</span>
|
<span>Search</span>
|
||||||
<select class="column form-control"></select>
|
<select class="column form-control"></select>
|
||||||
<select class="filter form-control">
|
<select class="filter form-control">
|
||||||
|
<option value="">Select filter</option>
|
||||||
<option value="equal">=</option>
|
<option value="equal">=</option>
|
||||||
<option value="not_equal">≠</option>
|
<option value="not_equal">≠</option>
|
||||||
<option value="greater">></option>
|
<option value="greater">></option>
|
||||||
<option value-"greater_eq">≥</option>
|
<option value="greater_eq">≥</option>
|
||||||
<option value="less"><</option>
|
<option value="less"><</option>
|
||||||
<option value="less_eq">≤</option>
|
<option value="less_eq">≤</option>
|
||||||
<option value="like">LIKE</option>
|
<option value="like">LIKE</option>
|
||||||
|
@ -740,7 +740,7 @@ $(document).ready(function() {
|
|||||||
var filter = $(this).find("select.filter").val();
|
var filter = $(this).find("select.filter").val();
|
||||||
var query = $.trim($(this).find("input").val());
|
var query = $.trim($(this).find("input").val());
|
||||||
|
|
||||||
if (filterOptions[filter].indexOf("DATA") > 0 && query == "") {
|
if (filter && filterOptions[filter].indexOf("DATA") > 0 && query == "") {
|
||||||
alert("Please specify filter query");
|
alert("Please specify filter query");
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -765,7 +765,7 @@ $(document).ready(function() {
|
|||||||
$(".filters input").hide().val("");
|
$(".filters input").hide().val("");
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$(".filters input.text").show();
|
$(".filters input").show();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user