svn commit: r1054573 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java

[erwan]

Author: erwan
Date: Mon Jan  3 10:17:39 2011
New Revision: 1054573

URL: http://svn.apache.org/viewvc?rev=1054573&view=rev
Log:
Online documentation wasn't working as described in ExampleEntityLabels :
        FieldDescription.[fieldname] - will be used for all fields of that name
        FieldDescription.[entityname].[fieldname] - will be used for the specified entity field

The FieldDescription.[fieldname] wasn't supported yet, now it's done. I've also changed the log level to verbose as it may full the log console it there are a lot of fields on a screen

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java?rev=1054573&r1=1054572&r2=1054573&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java Mon Jan  3 10:17:39 2011
@@ -52,10 +52,17 @@ public class UtilHelpText {
         String messageId = "FieldDescription." + entityName + "." + fieldName;
         String fieldDescription = UtilProperties.getMessage(entityResourceName, messageId, locale);
         if (fieldDescription.equals(messageId)) {
-            if (Debug.infoOn()) {
-                Debug.logInfo("No help text found in [" + entityResourceName + "] with key [" + messageId + "]", module);
+            messageId = "FieldDescription." + fieldName;
+            if (Debug.verboseOn()) {
+                Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "], Trying with: " + messageId, module);
+            }
+            fieldDescription = UtilProperties.getMessage(entityResourceName, messageId, locale);
+            if (fieldDescription.equals(messageId)) {
+                if (Debug.verboseOn()) {
+                    Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "]", module);
+                }
+                return "";
             }
-            return "";
         }
         return fieldDescription;
     }