svn commit: r513985 [3/3] - in /ofbiz/trunk: applications/content/ applications/content/config/ applications/content/data/ applications/content/entitydef/ applications/content/script/org/ofbiz/content/data/ applications/content/servicedef/ applications...

[jaz-3]

Modified: ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml Fri Mar  2 14:03:48 2007
@@ -223,4 +223,35 @@
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeType?mimeTypeId=${mimeTypeId}"/>
         </field>
     </form>
+
+    <!-- MimeTypeHtmlTemplate Froms -->
+    <form name="CreateMimeTypeHtmlTemplate" target="createMimeTypeHtmlTemplate" title="" type="single"
+          default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        <auto-fields-service service-name="createMimeTypeHtmlTemplate"/>
+        <field name="mimeTypeId" widget-style="tabletext">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="MimeType" description="${description}" key-field-name="mimeTypeId"/>
+            </drop-down>
+        </field>
+        <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
+            <submit button-type="button"/>
+        </field>
+    </form>
+
+    <form name="UpdateMimeTypeHtmlTemplate" target="updateMimeTypeHtmlTemplate" title="" type="list" paginate="true" paginate-size-field="25"
+          default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" list-name="contentList">
+        <actions>
+          <entity-condition entity-name="MimeTypeHtmlTemplate" use-cache="false"/>
+        </actions>
+        <auto-fields-service service-name="updateMimeTypeHtmlTemplate"/>
+        <field name="mimeTypeId" widget-style="tabletext">
+            <hyperlink target-type="intra-app" target="editMimeType?mimeTypeId=${mimeTypeId}" description="${mimeTypeId}"/>                
+        </field>        
+        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
+            <submit button-type="button"/>
+        </field>
+        <field name="deleteLink" title="" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeTypeHtmlTemplate?mimeTypeId=${mimeTypeId}&amp;dataResourceId=${dataResourceId}&amp;fromDate=${fromDate}"/>
+        </field>
+    </form>
 </forms>

Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl Fri Mar  2 14:03:48 2007
@@ -19,6 +19,7 @@
 
 <script type="text/javascript">
     function cmsSave() {
+        var simpleFormAction = '<@ofbizUrl>/updateContentCms</@ofbizUrl>';
         var editor = dojo.widget.byId("w_editor");
         if (editor) {
             var cmsdata = dojo.byId("cmsdata");
@@ -31,6 +32,15 @@
         // set the data resource name
         form.dataResourceName.value = form.contentName.value;
 
+        // check to see if we need to change the form action
+        var isUpload = form.elements['isUploadObject'];
+        if (isUpload && isUpload.value == 'Y') {
+            var uploadValue = form.elements['uploadedFile'].value;
+            if (uploadValue == null || uploadValue == "") {
+                form.action = simpleFormAction;
+            }            
+        }
+
         // submit the form
         if (form != null) {
             form.submit();
@@ -259,8 +269,16 @@
           <#if (dataResourceTypeId == 'IMAGE_OBJECT' || dataResourceTypeId == 'OTHER_OBJECT' ||
                 dataResourceTypeId == 'VIDEO_OBJECT' || dataResourceTypeId == 'AUDIO_OBJECT')>
             <tr>
+              <td colspan="2" align="right">
+                <#if ((content.contentId)?has_content)>
+                    <@renderContentAsText contentId="${content.contentId}" ignoreTemplate="true"/>
+                </#if>                
+              </td>
+            </tr>
+            <tr>
               <td><div class="tableheadtext">Upload</div></td>
               <td>
+                <input type="hidden" name="isUploadObject" value="Y"/>
                 <input type="file" name="uploadedFile" class="inputBox" size="30"/>
               </td>
             </tr>

Modified: ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml Fri Mar  2 14:03:48 2007
@@ -122,6 +122,23 @@
             </widgets>
         </section>
     </screen>
+    <screen name="EditMimeTypeHtmlTemplate">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleEditMimeTypeHtmlTemplate"/>
+                <set field="headerItem" value="DataResourceSetupMenu"/>
+                <set field="tabButtonItem" to-scope="user" value="EditMimeTypeHtmlTemplate"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="commonDataResourceSetupDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-form name="UpdateMimeTypeHtmlTemplate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/>
+                        <include-form name="CreateMimeTypeHtmlTemplate" location="component://content/webapp/content/datasetup/DataSetupForms.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
     <screen name="EditDataCategory">
         <section>
             <actions>

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java Fri Mar  2 14:03:48 2007
@@ -143,7 +143,7 @@
             Map inContext = new HashMap();
             inContext.put("order", order);
             inContext.put("orderContent", orderContent);
-            ContentWorker.renderContentAsText(delegator, orderContent.getString("contentId"), outWriter, inContext, null, locale, mimeTypeId);
+            ContentWorker.renderContentAsText(delegator, orderContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, false);
         }
     }
 }

Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/content/PartyContentWrapper.java Fri Mar  2 14:03:48 2007
@@ -221,7 +221,7 @@
             Map inContext = FastMap.newInstance();
             inContext.put("party", party);
             inContext.put("partyContent", partyContent);
-            ContentWorker.renderContentAsText(delegator, partyContent.getString("contentId"), outWriter, inContext, null, locale, mimeTypeId);
+            ContentWorker.renderContentAsText(delegator, partyContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, false);
         }
     }
 
@@ -238,7 +238,7 @@
                 Map inContext = FastMap.newInstance();
                 inContext.put("party", party);
                 inContext.put("partyContent", partyContent);
-                ContentWorker.renderContentAsText(delegator, partyContent.getString("contentId"), outWriter, inContext, null, locale, mimeTypeId);
+                ContentWorker.renderContentAsText(delegator, partyContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, false);
                 contentList.add(outWriter.toString());
             }
         }

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryContentWrapper.java Fri Mar  2 14:03:48 2007
@@ -141,7 +141,7 @@
             Map inContext = new HashMap();
             inContext.put("productCategory", productCategory);
             inContext.put("categoryContent", categoryContent);
-            ContentWorker.renderContentAsText(delegator, categoryContent.getString("contentId"), outWriter, inContext, null, locale, mimeTypeId);
+            ContentWorker.renderContentAsText(delegator, categoryContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, false);
         }
     }
 }

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java Fri Mar  2 14:03:48 2007
@@ -136,7 +136,7 @@
             Map inContext = new HashMap();
             inContext.put("productConfigItem", productConfigItem);
             inContext.put("productConfigItemContent", productConfigItemContent);
-            ContentWorker.renderContentAsText(delegator, productConfigItemContent.getString("contentId"), outWriter, inContext, null, locale, mimeTypeId);
+            ContentWorker.renderContentAsText(delegator, productConfigItemContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, false);
         }
     }
 }

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/KeywordIndex.java Fri Mar  2 14:03:48 2007
@@ -198,7 +198,7 @@
     public static void addWeightedDataResourceString(GenericValue drView, int weight, List strings, GenericDelegator delegator, GenericValue product) {
         Map drContext = UtilMisc.toMap("product", product);
         try {
-            String contentText = DataResourceWorker.renderDataResourceAsText(delegator, drView.getString("dataResourceId"), drContext, drView, null, null);
+            String contentText = DataResourceWorker.renderDataResourceAsText(delegator, drView.getString("dataResourceId"), drContext, null, null, false);
             for (int i = 0; i < weight; i++) {
                 strings.add(contentText);
             }

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java Fri Mar  2 14:03:48 2007
@@ -163,7 +163,7 @@
             Map inContext = new HashMap();
             inContext.put("product", product);
             inContext.put("productContent", productContent);
-            ContentWorker.renderContentAsText(delegator, productContent.getString("contentId"), outWriter, inContext, null, locale, mimeTypeId);
+            ContentWorker.renderContentAsText(delegator, productContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, false);
         }
     }
 }

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java Fri Mar  2 14:03:48 2007
@@ -247,7 +247,7 @@
             inContext.put("postalCode", shipToAddress.getString("postalCode"));
         }
         try {
-            Map tmpResult = ContentWorker.renderContentAsText(delegator, templateName, outWriter, inContext, null, locale, "text/plain");
+            ContentWorker.renderContentAsText(delegator, templateName, outWriter, inContext, locale, "text/plain", false);
         } catch (Exception e) {
             Debug.logError(e, "Cannot get DHL Estimate: Failed to render DHL XML Request.", module);
             return ServiceUtil.returnError("Cannot get DHL Estimate: Failed to render DHL XML Request.");
@@ -725,7 +725,7 @@
             inContext.put("shipperReference", shipment.getString("primaryOrderId") + "-" + shipment.getString("primaryShipGroupSeqId"));
             
             try {
-                Map tmpResult = ContentWorker.renderContentAsText(delegator, templateName, outWriter, inContext, null, locale, "text/plain");
+                ContentWorker.renderContentAsText(delegator, templateName, outWriter, inContext, locale, "text/plain", false);
             } catch (Exception e) {
                 Debug.logError(e, "Cannot confirm DHL shipment: Failed to render DHL XML Request.", module);
                 return ServiceUtil.returnError("Cannot confirm DHL shipment: Failed to render DHL XML Request.");

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/content/WorkEffortContentWrapper.java Fri Mar  2 14:03:48 2007
@@ -303,7 +303,7 @@
             Map inContext = FastMap.newInstance();
             inContext.put("workEffort", workEffort);
             inContext.put("workEffortContent", workEffortContent);
-            ContentWorker.renderContentAsText(delegator, workEffortContent.getString("contentId"), outWriter, inContext, null, locale, mimeTypeId);
+            ContentWorker.renderContentAsText(delegator, workEffortContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, false);
         }
     }
 
@@ -320,7 +320,7 @@
                 Map inContext = FastMap.newInstance();
                 inContext.put("workEffort", workEffort);
                 inContext.put("workEffortContent", workEffortContent);
-                ContentWorker.renderContentAsText(delegator, workEffortContent.getString("contentId"), outWriter, inContext, null, locale, mimeTypeId);
+                ContentWorker.renderContentAsText(delegator, workEffortContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, false);
                 contentList.add(outWriter.toString());
             }
         }

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java Fri Mar  2 14:03:48 2007
@@ -137,7 +137,7 @@
     public static void addWeightedDataResourceString(GenericValue dataResource, int weight, List strings, GenericDelegator delegator, GenericValue workEffort) {
         Map workEffortCtx = UtilMisc.toMap("workEffort", workEffort);
         try {
-            String contentText = DataResourceWorker.renderDataResourceAsText(delegator, dataResource.getString("dataResourceId"), workEffortCtx, dataResource, null, null);
+            String contentText = DataResourceWorker.renderDataResourceAsText(delegator, dataResource.getString("dataResourceId"), workEffortCtx, null, null, false);
             for (int i = 0; i < weight; i++) {
                 strings.add(contentText);
             }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java Fri Mar  2 14:03:48 2007
@@ -35,27 +35,15 @@
  */
 public interface ContentWorkerInterface {
 
+    // helper methods
     public GenericValue getCurrentContentExt(GenericDelegator delegator, List trail, GenericValue userLogin, Map ctx, Boolean nullThruDatesOnly, String contentAssocPredicateId)  throws GeneralException;
-
-    public Map renderSubContentAsTextExt(GenericDelegator delegator, String contentId, Writer out, String mapKey, String subContentId, GenericValue subContentDataResourceView,
-            Map templateContext, Locale locale, String mimeTypeId, GenericValue userLogin, Timestamp fromDate) throws GeneralException, IOException;
-
-    public String renderSubContentAsTextCacheExt(GenericDelegator delegator, String contentId,  String mapKey,  GenericValue subContentDataResourceView,
-            Map templateRoot, Locale locale, String mimeTypeId, GenericValue userLogin, Timestamp fromDate) throws GeneralException, IOException;
-
-    public Map renderSubContentAsTextCacheExt(GenericDelegator delegator, String contentId, Writer out, String mapKey,  GenericValue subContentDataResourceView,
-            Map templateRoot, Locale locale, String mimeTypeId, GenericValue userLogin, Timestamp fromDate) throws GeneralException, IOException;
-
-    public Map renderSubContentAsTextCacheExt(GenericDelegator delegator, String contentId, Writer out, String mapKey,  GenericValue subContentDataResourceView,
-            Map templateRoot, Locale locale, String mimeTypeId, GenericValue userLogin, Timestamp fromDate, Boolean nullThruDatesOnly) throws GeneralException, IOException;
-
-    public Map renderContentAsTextExt(GenericDelegator delegator, String contentId, Writer out, Map templateContext, GenericValue view, Locale locale, String mimeTypeId) throws GeneralException, IOException;
-
-    public String renderContentAsTextCacheExt(GenericDelegator delegator, String contentId,  Map templateContext, GenericValue view, Locale locale, String mimeTypeId) throws GeneralException, IOException;
-
-    public Map renderContentAsTextCacheExt(GenericDelegator delegator, String contentId, Writer out, Map templateContext, GenericValue view, Locale locale, String mimeTypeId) throws GeneralException, IOException;
-
+    public GenericValue getWebSitePublishPointExt(GenericDelegator delegator, String contentId, boolean ignoreCache) throws GenericEntityException;
     public String getMimeTypeIdExt(GenericDelegator delegator, GenericValue view, Map ctx);
 
-    public GenericValue getWebSitePublishPointExt(GenericDelegator delegator, String contentId, boolean ignoreCache) throws GenericEntityException;
+    // new rendering methods
+    public void renderContentAsTextExt(GenericDelegator delegator, String contentId, Writer out, Map templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException;
+    public String renderContentAsTextExt(GenericDelegator delegator, String contentId, Map templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException;
+
+    public void renderSubContentAsTextExt(GenericDelegator delegator, String contentId, Writer out, String mapKey, Map templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException;
+    public String renderSubContentAsTextExt(GenericDelegator delegator, String contentId, String mapKey, Map templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException;            
 }

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java?view=diff&rev=513985&r1=513984&r2=513985
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java Fri Mar  2 14:03:48 2007
@@ -42,6 +42,7 @@
 import org.ofbiz.widget.WidgetContentWorker;
 import org.ofbiz.widget.screen.ModelScreenWidget;
 import org.ofbiz.widget.screen.ScreenStringRenderer;
+import javolution.util.FastMap;
 
 /**
  * Widget Library - HTML Form Renderer implementation
@@ -290,12 +291,16 @@
         String renderedContent = null;
         GenericDelegator delegator = (GenericDelegator) context.get("delegator");
 
+        // make a new map for content rendering; so our current map does not get clobbered
+        Map contentContext = FastMap.newInstance();
+        contentContext.putAll(context);
+
         if (Debug.verboseOn()) Debug.logVerbose("expandedContentId:" + expandedContentId, module);
         
         try {
             if (UtilValidate.isNotEmpty(expandedContentId)) {
                 if (WidgetContentWorker.contentWorker != null) {
-                    renderedContent = WidgetContentWorker.contentWorker.renderContentAsTextCacheExt(delegator, expandedContentId, context, null, locale, mimeTypeId);
+                    renderedContent = WidgetContentWorker.contentWorker.renderContentAsTextExt(delegator, expandedContentId, contentContext, locale, mimeTypeId, true);
                 } else {
                     Debug.logError("Not rendering content, not ContentWorker found.", module);
                 }
@@ -304,7 +309,7 @@
                 String editRequest = content.getEditRequest(context);
                 if (UtilValidate.isNotEmpty(editRequest)) {
                     if (WidgetContentWorker.contentWorker != null) {
-                        WidgetContentWorker.contentWorker.renderContentAsTextCacheExt(delegator, "NOCONTENTFOUND", writer, context, null, locale, mimeTypeId);
+                        WidgetContentWorker.contentWorker.renderContentAsTextExt(delegator, "NOCONTENTFOUND", writer, contentContext, locale, mimeTypeId, true);
                     } else {
                         Debug.logError("Not rendering content, not ContentWorker found.", module);
                     }
@@ -403,24 +408,19 @@
 
     public void renderSubContentBody(Writer writer, Map context, ModelScreenWidget.SubContent content) throws IOException {
             Locale locale = Locale.getDefault();
-            //Boolean nullThruDatesOnly = new Boolean(false);
             String mimeTypeId = "text/html";
             String expandedContentId = content.getContentId(context);
             String expandedMapKey = content.getMapKey(context);
             String renderedContent = null;
             GenericDelegator delegator = (GenericDelegator) context.get("delegator");
-            Timestamp fromDate = UtilDateTime.nowTimestamp();
-            HttpServletRequest request = (HttpServletRequest) context.get("request");
-            GenericValue userLogin = null;
-            if (request != null) {
-                HttpSession session = request.getSession();
-                userLogin = (GenericValue) session.getAttribute("userLogin");
-            }
-            
-            //Debug.logInfo("expandedContentId=" + expandedContentId + ", expandedAssocName=" + expandedAssocName, module);
+
+            // create a new map for the content rendering; so our current context does not get overwritten!
+            Map contentContext = FastMap.newInstance();
+            contentContext.putAll(context);
+
             try {
                 if (WidgetContentWorker.contentWorker != null) {
-                    renderedContent = WidgetContentWorker.contentWorker.renderSubContentAsTextCacheExt(delegator, expandedContentId, expandedMapKey, null, context, locale, mimeTypeId, userLogin, fromDate);
+                    renderedContent = WidgetContentWorker.contentWorker.renderSubContentAsTextExt(delegator, expandedContentId, expandedMapKey, contentContext, locale, mimeTypeId, true);
                     //Debug.logInfo("renderedContent=" + renderedContent, module);
                 } else {
                     Debug.logError("Not rendering content, not ContentWorker found.", module);
@@ -429,7 +429,7 @@
                     String editRequest = content.getEditRequest(context);
                     if (UtilValidate.isNotEmpty(editRequest)) {
                         if (WidgetContentWorker.contentWorker != null) {
-                            WidgetContentWorker.contentWorker.renderContentAsTextCacheExt(delegator, "NOCONTENTFOUND", writer, context, null, locale, mimeTypeId);
+                            WidgetContentWorker.contentWorker.renderContentAsTextExt(delegator, "NOCONTENTFOUND", writer, contentContext, locale, mimeTypeId, true);
                         } else {
                             Debug.logError("Not rendering content, ContentWorker not found.", module);
                         }