Skip to content

Commit

Permalink
No functional changes, only syntax improvements
Browse files Browse the repository at this point in the history
Replaces "?if_exists" occurences by ! 
Removes a test on "?has_content" when not needed (! is enough).
Removes "?if_exists" when useless (after ?has_content)




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1684030 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
JacquesLeRoux committed Jun 7, 2015
1 parent b5f1c6b commit ca73c9a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ specific language governing permissions and limitations
under the License.
-->
<#escape x as x?xml>
<fo:block>${postalAddress.address1?if_exists}</fo:block>
<#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
<fo:block>${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode?if_exists}</fo:block>
<fo:block>${postalAddress.address1!}</fo:block>
<#if postalAddress.address2?has_content><fo:block>${postalAddress.address2}</fo:block></#if>
<fo:block>${postalAddress.city!}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode!}</fo:block>
<#if postalAddress.countryGeoId?has_content>
<fo:block>
<#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ specific language governing permissions and limitations
under the License.
-->
<#escape x as x?xml>
<fo:block>${postalAddress.address1?if_exists}</fo:block>
<#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if>
<fo:block>${postalAddress.postalCode?if_exists} ${postalAddress.city?if_exists}</fo:block>
<fo:block>${postalAddress.address1!}</fo:block>
<#if postalAddress.address2?has_content><fo:block>${postalAddress.address2}</fo:block></#if>
<fo:block>${postalAddress.postalCode!} ${postalAddress.city!}</fo:block>
<#if postalAddress.countryGeoId?has_content>
<fo:block>
<#assign country = postalAddress.getRelatedOne("CountryGeo", true)>
${country.get("geoName", locale)?default(country.geoId)}
</fo:block>
</#if>
</#escape>
</#escape>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ under the License.
-->
<#escape x as x?xml>
<fo:block>${postalAddress.address1!}</fo:block>
<#if postalAddress.address2?has_content><fo:block>${postalAddress.address2!}</fo:block></#if>
<#if postalAddress.address2?has_content><fo:block>${postalAddress.address2}</fo:block></#if>
<fo:block>${postalAddress.city!}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode!}</fo:block>
<#if postalAddress.countryGeoId?has_content>
<fo:block>
Expand Down

0 comments on commit ca73c9a

Please sign in to comment.