Changeset 3436

Timestamp:

08/23/10 23:02:03 (18 months ago)

Author:

mswertz

Message:

fix for bug #90 broken xref links in nested form

File:

• molgenis/3.3/src/org/molgenis/framework/ui/FormModel.java (modified) (5 diffs)

molgenis/3.3/src/org/molgenis/framework/ui/FormModel.java

@@ -732 +732 @@
 
                                 // add filters for xref or mref relationships (if any)
-                                // if multiple xrefs apply then the filters are union 
+                                // if multiple xrefs apply then the filters are union
                                 // (so xref1 OR xref2 OR etc)
                                 if (records.size() > 0)
@@ -744 +744 @@
                                                 if (values.size() > 0)
                                                 {
-                                                        for (int i = 0; i < values.size(); i ++)
+                                                        for (int i = 0; i < values.size(); i++)
                                                         {
-                                                                QueryRule rule = new QueryRule(pf.getXrefToParent(), QueryRule.Operator.EQUALS, values.get(i));
+                                                                QueryRule rule = new QueryRule(pf.getXrefToParent(), QueryRule.Operator.EQUALS, values
+                                                                                .get(i));
+                                                                if(xref_filters.size() > 0) xref_filters.add(new QueryRule(Operator.OR));
                                                                 xref_filters.add(rule);
-                                                                xref_filters.add(new QueryRule(Operator.OR));
                                                         }
                                                 }
@@ -757 +758 @@
                                                         QueryRule rule = new QueryRule(pf.getXrefToParent(), QueryRule.Operator.EQUALS,
                                                                         Integer.MIN_VALUE);
+                                                        if(xref_filters.size() > 0) xref_filters.add(new QueryRule(Operator.OR));
                                                         xref_filters.add(rule);
-                                                        xref_filters.add(new QueryRule(Operator.OR));
+                                                        
                                                 }
                                         }
@@ -765 +767 @@
                                         {
                                                 QueryRule rule = new QueryRule(pf.getXrefToParent(), QueryRule.Operator.EQUALS, parentValue);
+                                                if (xref_filters.size() > 0) xref_filters.add(new QueryRule(Operator.OR));
                                                 xref_filters.add(rule);
-                                                xref_filters.add(new QueryRule(Operator.OR));
+
                                         }
-                                        else
-                                        {
-                                                QueryRule rule = new QueryRule(pf.getXrefToParent(), QueryRule.Operator.EQUALS,
-                                                                Integer.MIN_VALUE);
-                                                xref_filters.add(rule);
-                                                xref_filters.add(new QueryRule(Operator.OR));
-                                        }
+//                                      else
+//                                      {
+//                                              QueryRule rule = new QueryRule(pf.getXrefToParent(), QueryRule.Operator.EQUALS,
+//                                                              Integer.MIN_VALUE);
+//                                              if (xref_filters.size() > 0) xref_filters.add(new QueryRule(Operator.OR));
+//                                              xref_filters.add(rule);
+//
+//                                      }
                                 }
                         }
                         // put it all in one clause, e.g. (xref1 = 0 OR xref1 = 1 OR xref2=3
                         // ....)
+                        if(rules.size()>0) rules.add(new QueryRule(Operator.OR));
                         rules.add(new QueryRule(xref_filters));
-                        rules.add(new QueryRule(Operator.OR));
+                        
                 }
 
@@ -786 +791 @@
                 {
                         QueryRule rule = super.getRootScreen().getLogin().getRowlevelSecurityFilters(this.create());
-                        if (rule != null /* && !rule.equals(new QueryRule()) */) rules.add(rule);
+                        if (rule != null && !rule.equals(new QueryRule())) rules.add(rule);
                 }
                 return rules;