svn commit: r941603 - in /ofbiz/branches/release10.04: ./ framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java

[erwan]

Author: erwan
Date: Thu May  6 08:01:00 2010
New Revision: 941603

URL: http://svn.apache.org/viewvc?rev=941603&view=rev
Log:
Applied fix from trunk for revision: 941600
 Modification on previous commit (941261) : we need to return an empty string if there is no value found for the key, regardless of whether debuging is on or off

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  6 08:01:00 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941199,941261,941440
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941199,941261,941440,941600

Modified: ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java?rev=941603&r1=941602&r2=941603&view=diff
==============================================================================
--- ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java (original)
+++ ofbiz/branches/release10.04/framework/widget/src/org/ofbiz/widget/form/UtilHelpText.java Thu May  6 08:01:00 2010
@@ -51,8 +51,10 @@ public class UtilHelpText {
         String entityResourceName = entity.getDefaultResourceName();
         String messageId = "FieldDescription." + entityName + "." + fieldName;
         String fieldDescription = UtilProperties.getMessage(entityResourceName, messageId, locale);
-        if (fieldDescription.equals(messageId) && Debug.infoOn()) {
-            Debug.logInfo("No help text found in [" + entityResourceName + "] with key [" + messageId + "]", module);
+        if (fieldDescription.equals(messageId)) {
+            if (Debug.infoOn()) {
+                Debug.logInfo("No help text found in [" + entityResourceName + "] with key [" + messageId + "]", module);
+            }
             return "";
         }
         return fieldDescription;