svn commit: r1085697 - /ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl

Author: jleroux
Date: Sat Mar 26 11:24:38 2011
New Revision: 1085697

URL: http://svn.apache.org/viewvc?rev=1085697&view=rev
Log:
A patch from Mirko Vogelsmeier "Exception if a description for an item on main.ftl in accounting is null." https://issues.apache.org/jira/browse/OFBIZ-4229 - OFBIZ-4229

In the main.ftl of the accounting-module there are a lot of items listed (like paymentMethodTypes, paymentTypes, ...).
If one of these items does not have a description defined, an Exception is thrown.
As a fallback to the description i did add the Id.
Like if paymentMethodType.description doesnt exists, it gets the paymentMethodType.paymentMethodTypeId.

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl?rev=1085697&r1=1085696&r2=1085697&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/main.ftl Sat Mar 26 11:24:38 2011
@@ -70,14 +70,14 @@ under the License.
 <td>
 <ul>
 <#list invoiceTypes as invoiceType>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&amp;invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${invoiceType.get("description",locale)}</a></li>
+<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&amp;invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${invoiceType.get("description",locale)!invoiceType.invoiceTypeId}</a></li>
 </#list>
 </ul>
 </td>
 <td>
 <ul>
 <#list invoiceStatus as status>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&amp;statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${status.get("description",locale)}</a></li>
+<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&amp;statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${status.get("description",locale)!status.statusId}</a></li>
 </#list>
 </ul>
 </td>
@@ -97,7 +97,7 @@ under the License.
 
 <ul>
 <#list paymentTypes as paymentType>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&amp;paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentType.get("description",locale)}</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&amp;paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentType.get("description",locale)!paymentType.paymentTypeId}</a></li>
 </#list>
 </ul>
 </td>
@@ -106,7 +106,7 @@ under the License.
 <td>
 <ul>
 <#list paymentMethodTypes as paymentMethodType>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&amp;paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentMethodType.get("description",locale)}</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&amp;paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentMethodType.get("description",locale)!paymentMethodType.paymentMethodTypeId}</a></li>
 </#list>
 </ul>
 </td>
@@ -114,7 +114,7 @@ under the License.
 <td>
 <ul>
 <#list paymentStatus as status>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&amp;statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${status.get("description",locale)}</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&amp;statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${status.get("description",locale)!status.statusId}</a></li>
 </#list>
 </ul>
 </td>