Scarab commit: svn commit: r10229 - branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm

Author: dabbous
Date: 2006-07-31 13:44:49-0700
New Revision: 10229

Modified:
   branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm

Log:
fixed a wrong call to an internal java method

Modified: branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm?view=diff&rev=10229&p1=branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm&p2=branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm&r1=10228&r2=10229
==============================================================================
--- branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm	(original)
+++ branches/release/b21/src/webapp/WEB-INF/templates/macros/MITListMacro.vm	2006-07-31 13:44:49-0700
@@ -36,8 +36,8 @@
 
 #set ($currentModule = $scarabR.CurrentModule)
 #set ($availableAttributes = $currentModule.AllOptionAttributes)
-#set ($currentAttributeKey = "attribute_id_"$currentModule.id)
-#set ($currentAttributeName = $scarabR.getSessionAttribute($currentAttributeKey) )
+#set ($sessionAttributeKey  = "attribute_id_$currentModule.moduleId" ) 
+#set ($currentAttributeName = $scarabR.getSessionAttribute($sessionAttributeKey) )
 #set ($currentAttributeOptions = $currentModule.getAllAttributeOptions($currentAttributeName))
 #set ($currentRmits = $user.getAllRModuleIssueTypes($currentModule))
 #set ($savedLists = $user.MITLists)
@@ -367,16 +367,15 @@
    #set ($availableAttributes  = $currentModule.AllOptionAttributes)
 
    #set ($currentAttributeId   = $data.Parameters.getInteger("attribute_id", 0) )
-   #set ($currentAttributeKey = "attribute_id_"$currentModule.id)
+   #set ($sessionAttributeKey  = "attribute_id_$currentModule.moduleId" ) 
    #if ($currentAttributeId == 0)
-     #if ($scarabR.hasSessionAttribute($currentAttributeKey) )
-       #set ($currentAttributeId = $scarabR.getSessionAttribute($currentAttributeKey) )
+     #if ($scarabR.hasSessionAttribute($sessionAttributeKey))
+       #set ($currentAttributeId = $scarabR.getSessionAttribute($sessionAttributeKey) )
      #else
        #set ($currentAttributeId = $availableAttributes.get(0).AttributeId )
      #end
    #end
-   #set ($dummy = $scarabR.setSessionAttribute($currentAttributeKey, $currentAttributeId))
-
+   #set ($dummy = $scarabR.setSessionAttribute($sessionAttributeKey, $currentAttributeId))
 
    <div class="scarab-canvas">
    <form name="mainform" action="$link.setPage("IssueTypeList.vm")">