[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 16:39:18

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/views/portlet
                        view-table.xhtml.vsl
  Log:
  fix button support in portlet table
  
  Revision  Changes    Path
  1.6       +4 -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.5
  retrieving revision 1.6
  diff -u -w -r1.5 -r1.6
  --- view-table.xhtml.vsl	27 Mar 2008 21:58:35 -0000	1.5
  +++ view-table.xhtml.vsl	27 Mar 2008 23:39:18 -0000	1.6
  @@ -78,8 +78,7 @@
   #set ($tableColumnActions = $table.getTableColumnActions($columnName))
   #if (!$tableColumnActions.empty)
   #set ($action = $tableColumnActions.iterator().next())
  -            <h:commandLink action="#{${action.controller.beanName}.${action.triggerName}}" styleClass="columnLink">
  -                <h:outputText value="#{row.${columnName}}">
  +            <h:commandLink value="#{row.${columnName}}" action="#{${action.controller.beanName}.${action.triggerName}}">
   #if ($column.type.dateType)
                       <a:convertDateTime pattern="$defaultDateFormat"/>
   #end
  @@ -108,8 +107,7 @@
   #foreach ($action in $table.tableHyperlinkActions)
   #if (!$action.tableLinkColumnName)
           <h:column>
  -            <h:commandLink action="#{${action.controller.beanName}.${action.triggerName}}">
  -                <h:outputText value="#{messages['$action.trigger.messageKey']}"/>
  +            <h:commandLink value="#{messages['$action.trigger.messageKey']}" action="#{${action.controller.beanName}.${action.triggerName}}">
   #renderTableCommandLinkParameters(false)
               </h:commandLink>
           </h:column>
  @@ -119,10 +117,9 @@
   #foreach ($action in $table.tableFormActions)
   #if (!$action.tableLinkColumnName)
           <h:column>
  -            <h:commandLink action="#{${action.controller.beanName}.${action.triggerName}}" styleClass="buttonLink">
  -                <h:outputText value="#{messages['$action.trigger.messageKey']}" />
  +            <h:commandButton value="#{messages['$action.trigger.messageKey']}" action="#{${action.controller.beanName}.${action.triggerName}}" actionListener="#{${action.controller.beanName}.action}">
   #renderTableCommandLinkParameters(true)
  -            </h:commandLink>
  +            </h:commandButton>
           </h:column>
   #end
   #end