[ofbiz-framework] branch release18.12 updated: Fixed: Propagate the theme in DataResourceWorker.renderDataResourceAsText() Improved: no functional change

[jl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 6787d21  Fixed: Propagate the theme in DataResourceWorker.renderDataResourceAsText() Improved: no functional change
6787d21 is described below

commit 6787d21522b5b2c3e378d466ea0131107989aac8
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Fri Mar 20 09:35:58 2020 +0100

    Fixed: Propagate the theme in DataResourceWorker.renderDataResourceAsText()
    Improved: no functional change
    
    (OFBIZ-9923)
    
    Seems that this has been fixed with OFBIZ-11466 "CommonTheme has a dependency on
    Flatgrey application.js"
    
    Thanks: Pierre Smits for the fix in OFBIZ-11466
---
 .../src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
index 8cd3634..d5fe3ae 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
@@ -658,7 +658,6 @@ public class DataResourceWorker  implements org.apache.ofbiz.widget.content.Data
             locale = Locale.getDefault();
         }
 
-        //FIXME correctly propagate the theme, then fixes also the related FIXME below
         VisualTheme visualTheme = ThemeFactory.getVisualThemeFromId("COMMON");
         ModelTheme modelTheme = visualTheme.getModelTheme();
 
@@ -725,7 +724,6 @@ public class DataResourceWorker  implements org.apache.ofbiz.widget.content.Data
 
             } else if ("XSLT".equals(dataTemplateTypeId)) {
                 File targetFileLocation = new File(System.getProperty("ofbiz.home")+"/runtime/tempfiles/docbook.css");
-                // This is related with the other FIXME above: we need to correctly propagate the theme.
                 String defaultVisualThemeId = EntityUtilProperties.getPropertyValue("general", "VISUAL_THEME", delegator);
                 visualTheme = ThemeFactory.getVisualThemeFromId(defaultVisualThemeId);
                 modelTheme = visualTheme.getModelTheme();