[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet view-table.xhtml.vsl

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

  User: cwbrandon
  Date: 08/03/27 14:46:14

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
                        view-table.xhtml.vsl
  Log:
  fix render table link params
  
  Revision  Changes    Path
  1.4       +12 -7     cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-table.xhtml.vsl
  
  Index: view-table.xhtml.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/portlet/view-table.xhtml.vsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- view-table.xhtml.vsl	27 Mar 2008 20:59:52 -0000	1.3
  +++ view-table.xhtml.vsl	27 Mar 2008 21:46:14 -0000	1.4
  @@ -1,14 +1,19 @@
   ##
   ## This macro renders the <f:param> elements for a command link
   ##
  -#macro (renderTableCommandLinkParameters)
  +#macro (renderTableCommandLinkParameters $attribute)
   #foreach ($parameter in $action.parameters)
   #if ($table.tableColumnNames.contains($parameter.name) || $table.tableAttributeNames.contains($parameter.name))
   #set ($parameterValue = "row.${parameter.name}")
   #else
  -#set ($parameterValue = "${actionFormKey}.${parameter.name}")
  +#set ($parameterValue = "$parameter.name")
   #end
  -            <f:param name="$parameter.name" value="#{${parameterValue}}"/>
  +#if($attribute)
  +#set ($elementType = "attribute")
  +#else
  +#set ($elementType = "param")
  +#end
  +                <f:$elementType name="$parameter.name" value="#{${parameterValue}}"/>
   #end
   #end
   <div xmlns="http://www.w3.org/1999/xhtml"
  @@ -85,7 +90,7 @@
           <h:column>
               <f:facet name="header">
                   <t:commandSortHeader columnName="$columnName" arrow="true">
  -                    <h:outputText value="#{renderTable}"/>
  +                    <h:outputText value="#{messages['$table.getTableColumnMessageKey($columnName)']}"/>
                   </t:commandSortHeader>
               </f:facet>
   #set ($tableColumnActions = $table.getTableColumnActions($columnName))
  @@ -97,7 +102,7 @@
                       <a:convertDateTime pattern="$defaultDateFormat"/>
   #end
                   </h:outputText>
  -#renderTableCommandLinkParameters()
  +#renderTableCommandLinkParameters(false)
               </h:commandLink>
   #else
               <h:outputText value="#{row.${columnName}}">
  @@ -123,7 +128,7 @@
           <h:column>
               <h:commandLink action="#{${action.controller.beanName}.${action.triggerName}}">
                   <h:outputText value="#{messages['$action.trigger.messageKey']}"/>
  -#renderTableCommandLinkParameters()
  +#renderTableCommandLinkParameters(false)
               </h:commandLink>
           </h:column>
   #end
  @@ -134,7 +139,7 @@
           <h:column>
               <h:commandLink action="#{${action.controller.beanName}.${action.triggerName}}" styleClass="buttonLink">
                   <h:outputText value="#{messages['$action.trigger.messageKey']}" />
  -#renderTableCommandLinkParameters()
  +#renderTableCommandLinkParameters(true)
               </h:commandLink>
           </h:column>
   #end