From 9ea3b5ae35559c8998bda5ce5ddf46e90f8e2b70 Mon Sep 17 00:00:00 2001 From: Jacopo Cappellato Date: Sat, 27 Feb 2010 08:31:29 +0000 Subject: [PATCH] Applied fix from trunk for revision: 916925 Added missing BigDecimal condition required to render the content of BigDecimal fields in the "view generic" screen. OFBIZ-3522 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release09.04@916926 13f79535-47bb-0310-9956-ffa450edef68 --- .../webtools/WEB-INF/actions/entity/ViewGeneric.groovy | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy b/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy index a3a1546fd6c..1f794e58422 100644 --- a/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy +++ b/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy @@ -115,6 +115,8 @@ if (value != null) { fieldValue = UtilFormatOut.safeToString((Double)value.get(field.getName())); } else if (type.getJavaType().indexOf("Float") >= 0) { fieldValue = UtilFormatOut.safeToString((Float)value.get(field.getName())); + } else if (type.getJavaType().indexOf("BigDecimal") >= 0) { + fieldValue = UtilFormatOut.safeToString((BigDecimal)value.get(field.getName())); } else if (type.getJavaType().indexOf("String") >= 0) { fieldValue = UtilFormatOut.checkNull((String)value.get(field.getName())); } @@ -271,6 +273,9 @@ for (int fnum = 0; fnum < entity.getNopksSize();fnum++) { } else if (type.getJavaType().indexOf("Float") >= 0) { fieldValue = (value != null && useValue) ? UtilFormatOut.safeToString((Float)value.get(field.getName())):UtilFormatOut.checkNull(parameters.get(field.getName())); fieldType = "Float"; + } else if (type.getJavaType().indexOf("BigDecimal") >= 0) { + fieldValue = (value != null && useValue) ? UtilFormatOut.safeToString((BigDecimal)value.get(field.getName())):UtilFormatOut.checkNull(parameters.get(field.getName())); + fieldType = "BigDecimal"; } else if (type.getJavaType().indexOf("String") >= 0) { if (type.stringLength() <= 80) { fieldValue = (value != null && useValue) ? UtilFormatOut.checkNull((String)value.get(field.getName())):UtilFormatOut.checkNull(parameters.get(field.getName()));