svn commit: r1560057 - in /ofbiz/branches/release13.07: ./ applications/order/webapp/ordermgr/order/orderinfo.ftl applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl

[adrianc]

Author: adrianc
Date: Tue Jan 21 16:13:16 2014
New Revision: 1560057

URL: http://svn.apache.org/r1560057
Log:
Merged revision(s) 1560056 from ofbiz/trunk:
Some Freemarker bug fixes.

Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderinfo.ftl
    ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1560056

Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=1560057&r1=1560056&r2=1560057&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderinfo.ftl Tue Jan 21 16:13:16 2014
@@ -192,7 +192,7 @@ under the License.
                   </#if>
               </td>
             </tr>
-            <#if orderItem.cancelBackOrderDate?exists>
+            <#if (orderItem.cancelBackOrderDate)?exists>
               <tr><td colspan="3"><hr /></td></tr>
               <tr>
                 <td align="right" valign="top" width="15%" class="label">&nbsp;${uiLabelMap.FormFieldTitle_cancelBackOrderDate}</td>

Modified: ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl?rev=1560057&r1=1560056&r2=1560057&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl (original)
+++ ofbiz/branches/release13.07/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl Tue Jan 21 16:13:16 2014
@@ -36,7 +36,7 @@ under the License.
               <td>${pContent.fromDate?if_exists}</td>
               <td class="button-col">
                 <#if (content.contentName?has_content)>
-                    <a href="<@ofbizUrl>img/${content.contentName}?imgId=${content.dataResourceId}</@ofbizUrl>">${uiLabelMap.CommonView}</a>
+                    <a href="<@ofbizUrl>img/${content.contentName}?imgId=${(content.dataResourceId)?if_exists}</@ofbizUrl>">${uiLabelMap.CommonView}</a>
                 </#if>
                 <form name="removePartyContent_${pContent_index}" method="post" action="<@ofbizUrl>removePartyContent/viewprofile</@ofbizUrl>">
                   <input type="hidden" name="contentId" value="${pContent.contentId}" />