Author: adrianc
Date: Fri Nov 15 20:52:48 2013
New Revision: 1542395
URL: http://svn.apache.org/r1542395
Log:
Merged revision(s) 1542388 from ofbiz/trunk:
Fixed a bug in the setSyncServiceParameters screen. Some service parameter data
types would cause FreeMarker to throw an exception.
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1542388
Modified:
ofbiz/branches/release13.07/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl?rev=1542395&r1=1542394&r2=1542395&view=diff
==============================================================================
---
ofbiz/branches/release13.07/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
(original)
+++
ofbiz/branches/release13.07/framework/webtools/webapp/webtools/service/setServiceParameterSync.ftl
Fri Nov 15 20:52:48 2013
@@ -27,9 +27,9 @@ under the License.
<tr>
<td class="label">${serviceParameter.name}
(${serviceParameter.type})</td>
<td>
- <input type="text" size="20" name="${serviceParameter.name}"
value="${serviceParameter.value?if_exists}" <#if serviceParameter.optional ==
"N">class="required"</#if>/>
+ <input type="text" size="20" name="${serviceParameter.name}"
value="<#if
serviceParameter.value?if_exists>${serviceParameter.value?string}</#if>"<#if
serviceParameter.optional == "N"> class="required"</#if>/>
<#if serviceParameter.optional == "N"><span
class="tooltip">${uiLabelMap.CommonRequired}</span></#if>
- <#if
serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault}
${serviceParameter.defaultValue}</#if>
+ <#if
serviceParameter.defaultValue?has_content>${uiLabelMap.WebtoolsServiceDefault}
${serviceParameter.defaultValue?string}</#if>
</td>
</tr>
</#list>
