Fixing changes missed during rebase
This commit is contained in:
parent
795d7232aa
commit
e8f454afc7
@ -205,7 +205,7 @@ public class ListFacet implements Facet {
|
|||||||
if (_config.selectBoolean || _booleanCount > 0) {
|
if (_config.selectBoolean || _booleanCount > 0) {
|
||||||
writer.key("booleanChoice");
|
writer.key("booleanChoice");
|
||||||
writer.object();
|
writer.object();
|
||||||
writer.key("s"); writer.value(_configselectBoolean);
|
writer.key("s"); writer.value(_config.selectBoolean);
|
||||||
writer.key("c"); writer.value(_booleanCount);
|
writer.key("c"); writer.value(_booleanCount);
|
||||||
writer.endObject();
|
writer.endObject();
|
||||||
}
|
}
|
||||||
@ -270,7 +270,7 @@ public class ListFacet implements Facet {
|
|||||||
return
|
return
|
||||||
_eval == null ||
|
_eval == null ||
|
||||||
_errorMessage != null ||
|
_errorMessage != null ||
|
||||||
(_config.selection.size() == 0 && !_config.selectBlank && !_config.selectError) ?
|
(_config.selection.size() == 0 && !_config.selectBlank && !_config.selectError && !_config.selectNumber && !_config.selectDateTime && !_config.selectBoolean) ?
|
||||||
null :
|
null :
|
||||||
new ExpressionEqualRowFilter(
|
new ExpressionEqualRowFilter(
|
||||||
_eval,
|
_eval,
|
||||||
|
Loading…
Reference in New Issue
Block a user