MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [eventFiltering] Improved UI - WIP

pull/4076/head
mokaddem 2019-01-30 14:15:05 +01:00
parent 7ea0e905eb
commit 613430270e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/View/Elements/Events/View/eventFilteringQueryBuilder.ctp
View File

@ -21,7 +21,6 @@ function triggerEventFilteringTool(clicked) {
}, },
allow_empty: true, allow_empty: true,
display_empty_filter: false, display_empty_filter: false,
conditions: ['OR', 'AND'],
lang: { lang: {
operators: { operators: {
equal: 'show', equal: 'show',
@ -225,7 +224,7 @@ function triggerEventFilteringTool(clicked) {
} }
}, },
], ],
rules: rules = { rules: {
condition: 'AND', condition: 'AND',
not: false, not: false,
rules: [ rules: [
@ -279,7 +278,8 @@ function triggerEventFilteringTool(clicked) {
condition: 'OR', condition: 'OR',
not: false, not: false,
flags: { flags: {
no_add_group: true no_add_group: true,
condition_readonly: true,
}, },
rules: [{ rules: [{
field: 'objectType', field: 'objectType',
@ -291,7 +291,8 @@ function triggerEventFilteringTool(clicked) {
condition: 'OR', condition: 'OR',
not: false, not: false,
flags: { flags: {
no_add_group: true no_add_group: true,
condition_readonly: true,
}, },
rules: [{ rules: [{
field: 'attributeType', field: 'attributeType',
@ -305,7 +306,8 @@ function triggerEventFilteringTool(clicked) {
} }
], ],
flags: { flags: {
no_add_group: true no_add_group: true,
condition_readonly: true,
} }
}, },
icons: { icons: {
@ -327,9 +329,6 @@ function triggerEventFilteringTool(clicked) {
updateURL(); updateURL();
}); });
$wrapper.toggle('blind', 100, { direction: 'up' }); $wrapper.toggle('blind', 100, { direction: 'up' });
// remove outer OR condition
$ev.find('#eventFilteringQB_group_0 > .rules-group-header input[value="OR"]').parent().remove();
$ev.find('#eventFilteringQB_group_0 > .rules-group-body input[value="AND"]').parent().remove();
$('#eventFilteringQBSubmit').off('click').on('click', function() { $('#eventFilteringQBSubmit').off('click').on('click', function() {
$button = $(this); $button = $(this);