[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet renderPortletActionFormInput.vm

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 08/05/06 14:55:17

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
                        renderPortletActionFormInput.vm
  Log:
  make renderInputTable take the owner parameter into account
  
  Revision  Changes    Path
  1.6       +9 -4      cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm
  
  Index: renderPortletActionFormInput.vm
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/renderPortletActionFormInput.vm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- renderPortletActionFormInput.vm	6 May 2008 14:43:06 -0000	1.5
  +++ renderPortletActionFormInput.vm	6 May 2008 21:55:17 -0000	1.6
  @@ -60,7 +60,7 @@
   #elseif ($parameter.inputTextarea)
           <h:inputTextarea id="$propertyId" value="#{${formValuePropertyName}}" required="$parameter.required" readonly="$parameter.readOnly"/>
   #elseif ($parameter.inputTable)
  -#renderInputTable($parameter)
  +#renderInputTable($parameter $ownerParameter)
   #elseif ($parameter.plainText)
           <h:outputText value="#{${formValuePropertyName}}"/>
   #elseif ($parameter.inputSecret)
  @@ -96,14 +96,19 @@
   ##
   ##  This macro renders an submittable input table
   ##
  -#macro (renderInputTable $parameter)
  -            <a:dataTable id="$parameter.name"
  +#macro (renderInputTable $parameter $ownerParameter)
  +#set ($propertyId = $parameter.getFormPropertyId($ownerParameter))
  +#set ($valuePropertyName = ${parameter.getFormPropertyName($ownerParameter)})
  +#set ($backingListName = ${parameter.getBackingListName($ownerParameter)})
  +#set ($backingValueName = ${parameter.getBackingValueName($ownerParameter)})
  +#set ($formValuePropertyName = "${formName}.${valuePropertyName}")
  +            <a:dataTable id="$propertyId"
                   columnClasses="list-column-center,list-column-right, list-column-center,list-column-right"
                   headerClass="list-header"
                   rowClasses="list-row"
                   styleClass="list-background"
                   backingValue="#{${backingValueName}}"
  -                value="#{${formName}.${parameter.name}}"
  +                value="#{${formValuePropertyName}}"
                   identifierColumns="$parameter.inputTableIdentifierColumns"
                   var="item">
   #foreach ($column in $parameter.tableColumns)