Merge pull request #5 from chunlinyao/master

Fix bug, label displayed for hidden field
moqui · Feb 5, 2016 · 642f9fe · 642f9fe
2 parents e0c6f5c + f1c221c
commit 642f9fe
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/template/screen-macro/DefaultScreenMacros.html.ftl b/template/screen-macro/DefaultScreenMacros.html.ftl
@@ -789,9 +789,9 @@ ${sri.renderIncludeScreen(.node["@location"], .node["@share-scope"]!)}
 </#macro>
 <#macro formSingleWidget fieldSubNode>
  <#assign fieldSubParent = fieldSubNode?parent>
- <#if fieldSubNode["ignored"]?has_content && ec.resource.condition(fieldSubParent["@hide"]!, "")><#return></#if>
- <#if fieldSubNode["hidden"]?has_content && ec.resource.condition(fieldSubParent["@hide"]!, "")><#recurse fieldSubNode/><#return></#if>
+ <#if fieldSubNode["ignored"]?has_content><#return></#if>
  <#if ec.resource.condition(fieldSubParent["@hide"]!, "")><#return></#if>
+ <#if fieldSubNode["hidden"]?has_content><#recurse fieldSubNode/><#return></#if>
  <#assign containerStyle = ec.resource.expand(fieldSubNode["@container-style"]!, "")>
  <#assign curFieldTitle><@fieldTitle fieldSubNode/></#assign>
  <#if bigRow>