svn commit: r1076906 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java

[lektran]

Author: lektran
Date: Fri Mar  4 00:46:09 2011
New Revision: 1076906

URL: http://svn.apache.org/viewvc?rev=1076906&view=rev
Log:
Fix bug in the screen widget's content renderer, if a dynamic contentId is 
supplied then the content's dataResourceId ends up getting stored in the 
Content widget object and is then used by later calls to the same widget 
regardless of contentId for certain operations (such as determining the mime 
type, which can affect rendering).

Modified:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=1076906&r1=1076905&r2=1076906&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java 
(original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java 
Fri Mar  4 00:46:09 2011
@@ -998,7 +998,6 @@ public abstract class ModelScreenWidget 
                 GenericValue dataResource = null;
                 if (UtilValidate.isNotEmpty(expandedDataResourceId)) {
                     dataResource = 
delegator.findByPrimaryKeyCache("DataResource", 
UtilMisc.toMap("dataResourceId", expandedDataResourceId));
-                    this.dataResourceId = 
FlexibleStringExpander.getInstance(expandedDataResourceId);
                 }
 
                 String mimeTypeId = null;