svn commit: r1819947 - /ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl

[akashjain]

Author: akashjain
Date: Wed Jan  3 10:43:36 2018
New Revision: 1819947

URL: http://svn.apache.org/viewvc?rev=1819947&view=rev
Log:
Reverted: Revision #1816270 not able to add a option with empty key in 
drop-down, (OFBIZ-9759)

Modified:
    
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl

Modified: 
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl?rev=1819947&r1=1819946&r2=1819947&view=diff
==============================================================================
--- 
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
 (original)
+++ 
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
 Wed Jan  3 10:43:36 2018
@@ -221,7 +221,7 @@ under the License.
       <#list options as item>
         <#if multiple?has_content>
           <option<#if currentValue?has_content && item.selected?has_content> 
selected="${item.selected}" <#elseif !currentValue?has_content && 
noCurrentSelectedKey?has_content && noCurrentSelectedKey == item.key> 
selected="selected" </#if> 
value="${item.key}">${item.description?replace("&#x5c;&#x27;","&#x27;")}</option><#rt/>
 <#-- replace("&#x5c;&#x27;","&#x27;") related to OFBIZ-6504 -->
-        <#elseif item.key?has_content && !(item.key == currentValue)>
+        <#else>
           <option<#if currentValue?has_content && currentValue == item.key && 
dDFCurrent?has_content && "selected" == dDFCurrent> selected="selected"<#elseif 
!currentValue?has_content && noCurrentSelectedKey?has_content && 
noCurrentSelectedKey == item.key> selected="selected"</#if> 
value="${item.key}">${item.description?replace("&#x5c;&#x27;","&#x27;")}</option><#rt/>
 <#-- replace("&#x5c;&#x27;","&#x27;") related to OFBIZ-6504 -->
         </#if>
       </#list>