Change fieldset query-command to add, not override commands

The logic in FieldSet stated that any explicit query-command
will deactivate all the standard derived commands. That is
inconsistent with query-command on fields, not mentioned in
the doc, and will generally break things.

This changes to the normal behavior where query-commands are
additive.

1 files changed, 3 insertions, 3 deletions

diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index 7543e3f030c..3c09a521715 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -673,11 +673,11 @@ void fieldSet(Search search) :
      // Apply settings after parsing since all user field items must be set first
 
      for (Object command : queryCommands)
-       search.fieldSets().userFieldSets().get(setName).queryCommands().add((String)command);
+         search.fieldSets().userFieldSets().get(setName).queryCommands().add((String)command);
 
      for (Object setting : matchSettings) {
-       ((SDField)setting).applyOperations();
-       search.fieldSets().userFieldSets().get(setName).setMatching(((SDField)setting).getMatching());
+         ((SDField)setting).applyOperations();
+         search.fieldSets().userFieldSets().get(setName).setMatching(((SDField)setting).getMatching());
      }
   }
 }