Scarab commit: svn commit: r10843 - trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java

Author: dabbous
Date: 2009-08-18 01:43:31-0700
New Revision: 10843

Modified:
   trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java

Log:
When an issue type contained only OptionAttributes of type TreeView, the queryMatrix throws a OutOfBoundsExeption. That was because the getAllOptionAttributes() method only returned StandardOptionAttributes.

Modified: trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java?view=diff&pathrev=10843&r1=10842&r2=10843
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	2009-08-18 01:43:31-0700
@@ -146,6 +146,13 @@
         "getAvailableIssueTypes";
     
     private static final L10NKey VALIDATION_MESSAGE = new L10NKey("ModuleValidationMessage");
+    
+    private static final List<Integer> OptionAttributeIds = new ArrayList<Integer>();
+    static
+    {
+        OptionAttributeIds.add(5); 
+        OptionAttributeIds.add(6);
+    }
 
     private List parentModules = null;
 
@@ -1134,9 +1141,8 @@
         throws TorqueException
     {
         Criteria crit = new Criteria();
-        crit.addJoin(RModuleAttributePeer.ATTRIBUTE_ID, 
-                AttributePeer.ATTRIBUTE_ID);
-        crit.add(AttributePeer.ATTRIBUTE_TYPE_ID, 5);
+        crit.addJoin(RModuleAttributePeer.ATTRIBUTE_ID, AttributePeer.ATTRIBUTE_ID);
+        crit.addIn(AttributePeer.ATTRIBUTE_TYPE_ID, OptionAttributeIds );
         crit.add(AttributePeer.DELETED, false);
         crit.add(RModuleAttributePeer.ACTIVE, true);
         crit.add(RModuleAttributePeer.MODULE_ID, getModuleId());

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2384663