This commit is contained in:
@@ -193,13 +193,18 @@
|
||||
prepend-icon="fa-filter"
|
||||
></v-select>
|
||||
<v-text-field
|
||||
v-if="
|
||||
item.tempFilterOperator != null &&
|
||||
item.tempFilterOperator != '*NOVALUE*' &&
|
||||
item.tempFilterOperator != '*HASVALUE*'
|
||||
"
|
||||
v-model="item.tempFilterValue"
|
||||
clearable
|
||||
></v-text-field>
|
||||
<v-btn
|
||||
large
|
||||
block
|
||||
v-if="item.tempFilterToken != null"
|
||||
v-if="item.tempFilterOperator != null"
|
||||
@click="addFilterCondition(item)"
|
||||
><v-icon large>fa-plus</v-icon></v-btn
|
||||
>
|
||||
@@ -488,7 +493,7 @@ export default {
|
||||
filterItem.op = item.tempFilterOperator;
|
||||
filterItem.value = item.tempFilterValue;
|
||||
//only add if there is both an op and a value
|
||||
//above here for tokens that isn't a restriction but
|
||||
//above here for tokens that isn't a restriction but
|
||||
//after passing through those conditions were at a point where there MUST be both
|
||||
if (filterItem.op && filterItem.value) {
|
||||
//display
|
||||
@@ -515,12 +520,12 @@ export default {
|
||||
}
|
||||
|
||||
var opDisplay = window.$gz._.find(
|
||||
this.pickLists.dateFilterOperators,
|
||||
this.pickLists.stringFilterOperators,
|
||||
{
|
||||
id: filterItem.op
|
||||
}
|
||||
).name;
|
||||
filterItem.display = opDisplay + " " + valueDisplay;
|
||||
filterItem.display = opDisplay + ' "' + valueDisplay + '"';
|
||||
|
||||
filterItemSet = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user