Scarab commit: svn commit: r10689 - branches/release/0.22/src/java/org/tigris/scarab/screens: . admin

Author: jhoech
Date: 2009-02-11 01:49:18-0800
New Revision: 10689

Modified:
   branches/release/0.22/src/java/org/tigris/scarab/screens/Default.java
   branches/release/0.22/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java

Log:
FIX - SCB2624 fixed behaviour of button "done" in screen ModuleAttributeEdit
  ADD - getter for cancel template in screens/Default.java
  ENH - screens/admin/ModuleAttributeEdit.java sets cancel template to default if the template is null of points to ModuleAttributeEdit.vm itself

Modified: branches/release/0.22/src/java/org/tigris/scarab/screens/Default.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/java/org/tigris/scarab/screens/Default.java?view=diff&pathrev=10689&r1=10688&r2=10689
==============================================================================
--- branches/release/0.22/src/java/org/tigris/scarab/screens/Default.java	(original)
+++ branches/release/0.22/src/java/org/tigris/scarab/screens/Default.java	2009-02-11 01:49:18-0800
@@ -301,4 +301,13 @@
         return (ScarabLocalizationTool) context.get(
             ScarabConstants.LOCALIZATION_TOOL);
     }
+    
+    /**
+     * Returns the cancelTemplate to be executed. Otherwise returns null.
+     */
+    public String getCancelTemplate(RunData data)
+    {
+        return data.getParameters()
+                   .getString(ScarabConstants.CANCEL_TEMPLATE, null);
+    }
 }

Modified: branches/release/0.22/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java?view=diff&pathrev=10689&r1=10688&r2=10689
==============================================================================
--- branches/release/0.22/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java	(original)
+++ branches/release/0.22/src/java/org/tigris/scarab/screens/admin/ModuleAttributeEdit.java	2009-02-11 01:49:18-0800
@@ -59,6 +59,7 @@
 import org.tigris.scarab.om.IssueType;
 import org.tigris.scarab.om.RModuleAttribute;
 import org.tigris.scarab.util.Log;
+import org.tigris.scarab.util.ScarabConstants;
 
 /**
  * Handles dynamic title
@@ -112,7 +113,21 @@
                }
            }
        }
-       
+
        return l10n.format("EditModuleAttribute", title);
     }
+    
+    public void doBuildTemplate(RunData data, TemplateContext context)
+    throws Exception
+    {
+    	super.doBuildTemplate(data, context);
+    	
+    	// workaround to avoid calling the same template once again as cancel template
+    	// SCB2624
+    	String cancelTemplate = getCancelTemplate(data);
+    	if(cancelTemplate == null || cancelTemplate.equals("admin,ModuleAttributeEdit.vm")){
+    		data.getParameters().setString(ScarabConstants.CANCEL_TEMPLATE, "admin,AttributeGroupEdit.vm");
+    	}
+    	
+    }
 }

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