struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [11/12] git commit: Checks is ListValueKey was defined and returns value
Date Fri, 27 Jun 2014 11:06:56 GMT
Checks is ListValueKey was defined and returns value


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ed8a0b87
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ed8a0b87
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ed8a0b87

Branch: refs/heads/feature/WW-4295-localization
Commit: ed8a0b87b29114ac5c99838e7d4cfc819ad71e43
Parents: a2791a8
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Fri Jun 27 12:55:43 2014 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Fri Jun 27 12:55:43 2014 +0200

----------------------------------------------------------------------
 core/src/main/resources/template/simple/select.ftl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/ed8a0b87/core/src/main/resources/template/simple/select.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/select.ftl b/core/src/main/resources/template/simple/select.ftl
index f4f27bf..dcb4b97 100644
--- a/core/src/main/resources/template/simple/select.ftl
+++ b/core/src/main/resources/template/simple/select.ftl
@@ -72,9 +72,12 @@
         <#if parameters.listValueKey??>
           <#-- checks the valueStack for the 'valueKey.' The valueKey is then looked-up
in the locale file for it's 
              localized value.  This is then used as a label -->
-          <#assign itemValue = stack.findString(parameters.listValueKey)/>
-          <#-- FIXME: find a better way to get the value than a call to @s.text -->
-          <#assign itemValue><@s.text name="${itemValue}"/></#assign>
+          <#assign valueKey = stack.findString(parameters.listValueKey) />
+          <#if valueKey??>
+              <#assign itemValue = struts.getText(valueKey) />
+          <#else>
+              <#assign itemValue = parameters.listValueKey />
+          </#if>
         <#elseif parameters.listValue??>
             <#if stack.findString(parameters.listValue)??>
               <#assign itemValue = stack.findString(parameters.listValue)/>


Mime
View raw message