[ofbiz-framework] branch trunk updated: Fixed: FindGeneric failed to generate forms (OFBIZ-11335)

[nmalin]

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

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


The following commit(s) were added to refs/heads/trunk by this push:
     new 0da10ea  Fixed: FindGeneric failed to generate forms (OFBIZ-11335)
0da10ea is described below

commit 0da10ea897ae0b9fc9654c8faedc6f435ec21c26
Author: Nicolas Malin <nicolas.ma...@nereide.fr>
AuthorDate: Thu Feb 20 19:34:01 2020 +0100

    Fixed: FindGeneric failed to generate forms
    (OFBIZ-11335)
    
    The commit 1941a05a349865b8505ec373de3fce3b3a96c2a0 introduce the 
visualTheme
    to generate a form with FactoryForm and forms present on FindGeneric has 
been forget
    
    Thanks to Sebastian Berg for raise this issue
---
 framework/webtools/groovyScripts/entity/FindGeneric.groovy | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/webtools/groovyScripts/entity/FindGeneric.groovy 
b/framework/webtools/groovyScripts/entity/FindGeneric.groovy
index cd8d06a..edbb4a4 100644
--- a/framework/webtools/groovyScripts/entity/FindGeneric.groovy
+++ b/framework/webtools/groovyScripts/entity/FindGeneric.groovy
@@ -68,7 +68,8 @@ if (modelEntity) {
     dynamicAutoEntityFieldSearchForm = dynamicAutoEntityFieldSearchForm + 
'</form></forms>'
     logVerbose(dynamicAutoEntityFieldSearchForm)
     Document dynamicAutoEntityFieldSearchFormXml = 
UtilXml.readXmlDocument(dynamicAutoEntityFieldSearchForm, true, true)
-    Map<String, ModelForm> modelFormMap = 
FormFactory.readFormDocument(dynamicAutoEntityFieldSearchFormXml, 
entityModelReader, dispatcher.getDispatchContext(), entityName)
+    Map<String, ModelForm> modelFormMap = 
FormFactory.readFormDocument(dynamicAutoEntityFieldSearchFormXml,
+            entityModelReader, context.visualTheme, 
dispatcher.getDispatchContext(), entityName)
     ModelForm modelForm
     if (modelFormMap) {
         Map.Entry<String, ModelForm> entry = 
modelFormMap.entrySet().iterator().next()
@@ -107,7 +108,8 @@ if (modelEntity) {
             </form></forms>"""
 
     Document dynamicAutoEntityFieldListFormXml = 
UtilXml.readXmlDocument(dynamicAutoEntityFieldListForm, true, true)
-    modelFormMap = 
FormFactory.readFormDocument(dynamicAutoEntityFieldListFormXml, 
entityModelReader, dispatcher.getDispatchContext(), entityName)
+    modelFormMap = 
FormFactory.readFormDocument(dynamicAutoEntityFieldListFormXml, 
entityModelReader,
+            context.visualTheme, dispatcher.getDispatchContext(), entityName)
     if (modelFormMap) {
         Map.Entry<String, ModelForm> entry = 
modelFormMap.entrySet().iterator().next()
         modelForm = entry.getValue()