svn commit: r506293 - /ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefMain.bsh

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r506293 - /ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefMain.bsh

hansbak-2
Author: hansbak
Date: Sun Feb 11 21:36:20 2007
New Revision: 506293

URL: http://svn.apache.org/viewvc?view=rev&rev=506293
Log:
new PartyInvitation table causing display of entities fall over : fixed

Modified:
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefMain.bsh

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefMain.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefMain.bsh?view=diff&rev=506293&r1=506292&r2=506293
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefMain.bsh (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityRefMain.bsh Sun Feb 11 21:36:20 2007
@@ -100,9 +100,9 @@
                     javaName = field.getIsPk() ? "<span style=\"color: red;\">" + field.getName() + "</span>" : field.getName();
                     javaNameMap.put("name", javaName);
                     javaNameMap.put("colName", field.getColName());
-                    javaNameMap.put("type", field.getType());
-                    javaNameMap.put("javaType", (field.getType() != null) ? type.getJavaType() : null);
-                    javaNameMap.put("sqlType", (field.getType() != null) ? type.getSqlType() : null);
+                    javaNameMap.put("type", (field.getType()) != null ? field.getType() : null);
+                    javaNameMap.put("javaType", (field.getType() != null && type != null) ? type.getJavaType() : "Undefined");
+                    javaNameMap.put("sqlType", (type != null && type.getSqlType() != null) ? type.getSqlType() : "Undefined");
                     
                     javaNameList.add(javaNameMap);            
                 }