admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-02-21 16:24:54 +00:00
parent 9ccb418a1e
commit 29c07bf140
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ayanova/src/views/ay-data-list-view.vue
View File

@@ -240,7 +240,7 @@
<!-- FILTER LIST --> <!-- FILTER LIST -->
<template v-if="item.filter.items.length > 0"> <template v-if="item.filter.items.length > 0">
<v-list elevation="2"> <v-list elevation="2">
<v-subheader> <v-subheader v-if="item.filter.items.length > 1">
<!-- AND / OR FILTER CONDITIONS --> <!-- AND / OR FILTER CONDITIONS -->
<v-radio-group v-model="item.filter.any" row> <v-radio-group v-model="item.filter.any" row>
<v-radio <v-radio
@@ -458,7 +458,7 @@ export default {
} }
//BLANKS / NONBLANKS TOKENS? //BLANKS / NONBLANKS TOKENS?
if (item.tempFilterOperator == "*NOVALUE*") { if (false == filterItemSet && item.tempFilterOperator == "*NOVALUE*") {
filterItem.op = "="; filterItem.op = "=";
filterItem.value = "*NULL*"; filterItem.value = "*NULL*";
//display //display
@@ -473,7 +473,7 @@ export default {
filterItemSet = true; filterItemSet = true;
} }
if (item.tempFilterOperator == "*HASVALUE*") { if (false == filterItemSet && item.tempFilterOperator == "*HASVALUE*") {
filterItem.op = "!="; filterItem.op = "!=";
filterItem.value = "*NULL*"; filterItem.value = "*NULL*";
//display //display
@@ -489,7 +489,11 @@ export default {
} }
//JUST REGULAR FILTER ITEM //JUST REGULAR FILTER ITEM
if (item.tempFilterOperator && item.tempFilterValue) { if (
false == filterItemSet &&
item.tempFilterOperator &&
item.tempFilterValue
) {
filterItem.op = item.tempFilterOperator; filterItem.op = item.tempFilterOperator;
filterItem.value = item.tempFilterValue; filterItem.value = item.tempFilterValue;
//only add if there is both an op and a value //only add if there is both an op and a value