Index: lams_central/web/includes/javascript/qb-search.js =================================================================== diff -u -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce -r475b1970be027a5c59a08d33ad1aa1f6b2443402 --- lams_central/web/includes/javascript/qb-search.js (.../qb-search.js) (revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce) +++ lams_central/web/includes/javascript/qb-search.js (.../qb-search.js) (revision 475b1970be027a5c59a08d33ad1aa1f6b2443402) @@ -1,16 +1,22 @@ - //auxiliary formatter for jqGrid's question column - function questionNameFormatter (cellvalue, options, rowObject) { - var questionDescription = rowObject[2] ? rowObject[2] : ""; +$(document).ready(function(){ + $('.selectpicker').on('changed.bs.select', function (e, clickedIndex, isSelected, previousValue) { + gridSearch(); + }); +}); - var text = "
" + cellvalue + "
"; - text += "
"; - if (questionDescription.length > 0) { - text += questionDescription; - } - text += "
" +//auxiliary formatter for jqGrid's question column +function questionNameFormatter (cellvalue, options, rowObject) { + var questionDescription = rowObject[2] ? rowObject[2] : ""; + + var text = "
" + cellvalue + "
"; + text += "
"; + if (questionDescription.length > 0) { + text += questionDescription; + } + text += "
" - return text; - } + return text; +} //search field handler var timeoutHnd; @@ -24,18 +30,17 @@ $("#questions-grid").jqGrid( 'setGridParam', { postData: { - questionType: $("#question-type").val(), + questionTypes: "" + $("#types-select").val(), + collectionUids: "" + $("#collections-select").val(), searchString: $("#filter-questions").val() } }, { page: 1 } ).trigger('reloadGrid'); $("#question-detail-area").hide("slow").html(""); - //jQuery("#bigset").jqGrid('setGridParam',{url:"bigset.php?nm_mask="+nm_mask+"&cd_mask="+cd_mask,page:1}).trigger("reloadGrid"); } - function gridSearchHighlight () { //highlight search results if ($("#filter-questions").val()) {