Scarab commit: svn commit: r10790 - trunk/src: java/org/tigris/scarab/om webapp/WEB-INF/templates/macros

Author: dabbous
Date: 2009-07-12 05:12:19-0700
New Revision: 10790

Modified:
   trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java
   trunk/src/java/org/tigris/scarab/om/RModuleOption.java
   trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm

Log:
SCB2979: fixed: trees with more than one sublevel are not correctly displayed in treeview

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=10790&r1=10789&r2=10790
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/AbstractScarabModule.java	2009-07-12 05:12:19-0700
@@ -1593,7 +1593,9 @@
 
 		boolean first = true;
 
-    	for (RModuleOption rmo : (List<RModuleOption>) moduleOption.getDescendants(moduleOption.getIssueType())) {
+		moduleOption.getChildren(moduleOption.getIssueType());
+		
+    	for (RModuleOption rmo : (List<RModuleOption>) moduleOption.getChildren(moduleOption.getIssueType())) {
     		if (!AbstractScarabModule.canMakeTransitionForOption(data, fromValue, rmo, issue, false)) continue;
 			if (!first) {
 				json.append(", ");

Modified: trunk/src/java/org/tigris/scarab/om/RModuleOption.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/om/RModuleOption.java?view=diff&pathrev=10790&r1=10789&r2=10790
==============================================================================
--- trunk/src/java/org/tigris/scarab/om/RModuleOption.java	(original)
+++ trunk/src/java/org/tigris/scarab/om/RModuleOption.java	2009-07-12 05:12:19-0700
@@ -47,20 +47,16 @@
  */ 
 
 // JDK classes
+import java.sql.Connection;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
-import java.sql.Connection;
 
-// Turbine classes
 import org.apache.torque.Torque;
 import org.apache.torque.TorqueException;
 import org.apache.torque.om.Persistent;
 import org.apache.torque.util.Criteria;
-
-import org.tigris.scarab.om.ModuleManager;
-import org.tigris.scarab.om.Module;
 import org.tigris.scarab.services.cache.ScarabCache;
 import org.tigris.scarab.tools.localization.L10NKeySet;
 import org.tigris.scarab.util.ScarabException;
@@ -241,6 +237,30 @@
         }
         return descendants;
     }
+    
+    /**
+     * Gets a list of this option's direct children
+     * That are associated with this module/Issue Type
+     * Needed for treeview display
+     * @return <code>List</code> of <code>RModuleOptions</code>
+     */
+	public List<RModuleOption> getChildren(IssueType issueType) throws TorqueException {
+    	List<RModuleOption> children = new ArrayList<RModuleOption>();
+    	
+        @SuppressWarnings("unchecked")
+    	List<AttributeOption> l = (List<AttributeOption>) this.getAttributeOption().getChildren();
+    	
+    	for (AttributeOption attrOption : l) {
+    		RModuleOption rmo = getModule().getRModuleOption(attrOption, issueType);
+            if (rmo != null && rmo.getOptionId().equals(attrOption.getOptionId())) {
+            	children.add(rmo);
+            }
+    	}
+    	
+    	return children;    	
+    }
+    
+    
         
     public void delete()
          throws TorqueException, ScarabException

Modified: trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm?view=diff&pathrev=10790&r1=10789&r2=10790
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/macros/GlobalMacros.vm	2009-07-12 05:12:19-0700
@@ -94,7 +94,7 @@
   #else
 
   <input id="$attrInput.get($optionFieldName).Key" value="$newValues" name="$attrInput.get($optionFieldName).Key" type="hidden"/>  
-  <input id="$attrInput.get($optionFieldName).Key:Display" type="text" size="20" readonly="" name="$attrInput.get($optionFieldName).Key:Display"/>
+  <input id="$attrInput.get($optionFieldName).Key:Display" type="text" size="$attr.FieldSize" readonly="" name="$attrInput.get($optionFieldName).Key:Display"/>
   <a class="treeview_button" id="$attrInput.get($optionFieldName).Key:Anchor" href="javascript:toggleTreePopup('$attrInput.get($optionFieldName).Key')">&nbsp;&nbsp;&nbsp;&nbsp;</a>
   
   #set ($attributeTreePopup = [])

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