[Andromda-cvs] SF.net SVN: andromda:[14826] trunk/cartridges/andromda-jsf/src/main/ resources/templates/jsf/views/facelets/crud/view.xhtml.vsl

[<wal...@us...>]

Revision: 14826
          http://andromda.svn.sourceforge.net/andromda/?rev=14826&view=rev
Author:   walterim
Date:     2011-02-07 16:17:52 +0000 (Mon, 07 Feb 2011)

Log Message:
-----------
Added supporte to association manageable <-> non-manageable

Modified Paths:
--------------
    trunk/cartridges/andromda-jsf/src/main/resources/templates/jsf/views/facelets/crud/view.xhtml.vsl

Modified: trunk/cartridges/andromda-jsf/src/main/resources/templates/jsf/views/facelets/crud/view.xhtml.vsl
===================================================================
--- trunk/cartridges/andromda-jsf/src/main/resources/templates/jsf/views/facelets/crud/view.xhtml.vsl	2011-02-07 16:10:40 UTC (rev 14825)
+++ trunk/cartridges/andromda-jsf/src/main/resources/templates/jsf/views/facelets/crud/view.xhtml.vsl	2011-02-07 16:17:52 UTC (rev 14826)
@@ -92,7 +92,7 @@
     <ui:param name="partialTriggers" value="#{fn:split('#if($manageable.create):${searchFormId}:newAction #end:${searchFormId}:searchResult:loadAction :${editFormId}:saveAction #if($manageable.create):${editFormId}:saveAndNewAction #end:${editFormId}:cancelAction',' ')}"/>
     <ui:param name="usesUpload" value=#if($manageable.needsFileUpload)"true"#else"false"#end/>
     <ui:define name="title">
-        <c:set var="title" value="#{messages['${manageable.viewTitleKey}']}#{messages['title.action.separator']}#{messages[${formName}.editState ? (empty ${formName}.${manageable.manageableIdentifier.name} ? 'title.action.new' : 'title.action.edit') : 'title.action.search']}" scope="request"/>
+        <c:set var="title" value="#{messages['${manageable.viewTitleKey}']}#{messages['title.action.separator']}#{messages[${formName}.editState ? (empty ${formName}.${manageable.identifierName} ? 'title.action.new' : 'title.action.edit') : 'title.action.search']}" scope="request"/>
     </ui:define>
     <ui:define name="content">
 #set ($clientValidation = $clientValidation && $manageable.validationRequired)
@@ -175,13 +175,13 @@
                 <h:panelGroup>
                     <tr:commandLink id="loadAction" actionListener="#{${manageable.controllerBeanName}.load}" partialSubmit="true" immediate="true">
                        <tr:image source="/images/tableLoad.gif" shortDesc="#{messages['action.load']}" inlineStyle="border-style:none" />
-                       <f:param name="${manageable.manageableIdentifier.name}" id="${manageable.manageableIdentifier.name}" value="#{row.${manageable.manageableIdentifier.name}}" />
+                       <f:param name="${manageable.identifierName}" id="${manageable.identifierName}" value="#{row.${manageable.identifierName}}" />
                     </tr:commandLink>
 #if ($manageable.delete)
                     <tr:spacer width="10" height="1"/>
                     <tr:commandLink id="deleteAction" actionListener="#{${manageable.controllerBeanName}.delete}" partialSubmit="true" immediate="true">
                         <tr:image source="/images/tableDelete.gif" shortDesc="#{messages['action.delete']}" inlineStyle="border-style:none" />
-                        <f:param name="${manageable.manageableIdentifier.name}" id="${manageable.manageableIdentifier.name}" value="#{row.${manageable.manageableIdentifier.name}}" />
+                        <f:param name="${manageable.identifierName}" id="${manageable.identifierName}" value="#{row.${manageable.identifierName}}" />
                     </tr:commandLink>
 #end
                 </h:panelGroup>
@@ -290,7 +290,7 @@
 #if ($manageable.create || !$manageable.update)
                        <tr:commandButton id="saveAction" text="#{messages['action.save']}" action="#{${manageable.controllerBeanName}.save}" accessKey="#{messages['action.save.access.key']}" partialSubmit="false"/>
 #if ($manageable.create)
-                       <tr:commandButton id="saveAndNewAction" text="#{messages['action.saveAndNew']}" action="#{${manageable.controllerBeanName}.saveAndNew}" accessKey="#{messages['action.saveAndNew.access.key']}" inlineStyle="display:#{(empty ${formName}.${manageable.manageableIdentifier.name})?'':'none'}" partialSubmit="false"/>
+                       <tr:commandButton id="saveAndNewAction" text="#{messages['action.saveAndNew']}" action="#{${manageable.controllerBeanName}.saveAndNew}" accessKey="#{messages['action.saveAndNew.access.key']}" inlineStyle="display:#{(empty ${formName}.${manageable.identifierName})?'':'none'}" partialSubmit="false"/>
 #end
                        <tr:commandButton id="cancelAction" text="#{messages['action.cancel']}" action="#{${manageable.controllerBeanName}.cancel}" accessKey="#{messages['action.cancel.access.key']}" immediate="true" partialSubmit="true" />
 #end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.