From: Walter M. <wal...@us...> - 2007-01-18 12:37:13
|
User: walterim Date: 07/01/18 04:37:14 Modified: andromda-jsf2/src/main/resources/templates/jsf2/views renderActionFormInput.vm andromda-jsf2/src/main/resources/templates/jsf2/configuration faces-config.xml.vsl Log: Reverting a wrong enumeration code. Correcting a menu text. Revision Changes Path 1.4 +1 -2 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm Index: renderActionFormInput.vm =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/views/renderActionFormInput.vm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- renderActionFormInput.vm 18 Jan 2007 10:11:07 -0000 1.3 +++ renderActionFormInput.vm 18 Jan 2007 12:37:13 -0000 1.4 @@ -32,7 +32,7 @@ #end #elseif ($parameter.inputCheckbox) <tr:selectBooleanCheckbox id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly"/> -#elseif ($parameter.inputSelect) +#elseif ($parameter.inputSelect || $parameter.type.enumeration) #set ($multiSelect = $parameter.type.collectionType || $parameter.type.arrayType) #set ($selectBoxType = "selectOneChoice") #if ($multiSelect) @@ -74,7 +74,6 @@ #set ($selectBoxType = "selectManyListbox") #end <tr:$selectBoxType id="$propertyId" value="#{${formValuePropertyName}}" label="#{messages['$parameter.messageKey']}:" required="$parameter.required" readOnly="$parameter.readOnly"#if ($multiSelect) size="$defaultMultiSelectSize"#else unselectedLabel=""#end> - <f:converter converterId="${parameter.type.fullyQualifiedName}"/> #foreach ($literal in $field.type.literals) #if ($literal.type.stringType)#set ($quote = '')#else#set ($quote = '"')#end #set($literalKey = $literal.name) 1.4 +1 -1 cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl Index: faces-config.xml.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/configuration/faces-config.xml.vsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- faces-config.xml.vsl 19 Dec 2006 09:15:15 -0000 1.3 +++ faces-config.xml.vsl 18 Jan 2007 12:37:13 -0000 1.4 @@ -69,7 +69,7 @@ <managed-bean-scope>application</managed-bean-scope> <managed-property> <property-name>label</property-name> - <value>$useCase.titleValue</value> + <value>$useCase.titleKey</value> </managed-property> <managed-property> <property-name>viewId</property-name> |