chg: [eventFiltering] Moved searchFor to the top

pull/4076/head
mokaddem 2019-01-30 14:37:07 +01:00
parent 613430270e
commit f8190d4c58
1 changed files with 6 additions and 6 deletions

View File

@ -228,6 +228,10 @@ function triggerEventFilteringTool(clicked) {
condition: 'AND',
not: false,
rules: [
{
field: 'searchFor',
id: 'searchFor'
},
{
field: 'attributeFilter',
id: 'attributeFilter',
@ -299,10 +303,6 @@ function triggerEventFilteringTool(clicked) {
id: 'attributeType',
value: '<?php reset($attribute_types); echo key($attribute_types); ?>',
}]
},
{
field: 'searchFor',
id: 'searchFor'
}
],
flags: {
@ -332,7 +332,7 @@ function triggerEventFilteringTool(clicked) {
$('#eventFilteringQBSubmit').off('click').on('click', function() {
$button = $(this);
var rules = querybuilderTool.getRules();
var rules = querybuilderTool.getRules({ skip_empty: true });
performQuery(rules);
});
@ -363,7 +363,7 @@ function triggerEventFilteringTool(clicked) {
}
function updateURL() {
var rules = querybuilderTool.getRules();
var rules = querybuilderTool.getRules({ skip_empty: true, allow_invalid: true });
var res = cleanRules(rules);
var url = "/events/view/<?php echo h($event['Event']['id']); ?>" + buildURL(res);
$('#eventFilteringQBLinkInput').val(url);