Changeset 22688

Timestamp:

03/09/10 11:58:28 (17 months ago)

Author:

dbutano

Message:

Only if the constraint has possible values, the getValidOps method returns a list containing LIKE, NOT LIKE, IN , NOT IN too

File:

• branches/mnw21/pathquery_refactor/intermine/web/main/src/org/intermine/web/logic/query/DisplayConstraint.java (modified) (1 diff)

branches/mnw21/pathquery_refactor/intermine/web/main/src/org/intermine/web/logic/query/DisplayConstraint.java

@@ -416 +416 @@
             // <c:if test="${!(editingNode.type == 'String' && (op.value == '<='
                                                              //|| op.value == '>='))}">
-
             // TODO this should show different options if a dropdown is to be used
-
+            boolean existPossibleValues =
+                (getPossibleValues() != null && getPossibleValues().size() > 0) ? true : false;
             for (ConstraintOp op : allOps) {
+                if (!existPossibleValues && (op.getIndex() == 6 || op.getIndex() == 7)) {
+                    continue;
+                }
                 validOps.add(new DisplayConstraintOption(op.toString(), op.getIndex()));
             }
-
-            for (ConstraintOp op : PathConstraintMultiValue.VALID_OPS) {
-                validOps.add(new DisplayConstraintOption(op.toString(),
+            if (existPossibleValues) {
+                for (ConstraintOp op : PathConstraintMultiValue.VALID_OPS) {
+                    validOps.add(new DisplayConstraintOption(op.toString(),
                         op.getIndex()));
-            }
-
+                }
+            }
         } else if (isLookup()) {
             // this must be a LOOKUP constraint