Author: deepak
Date: Sun Dec 10 11:07:07 2017
New Revision: 1817693
URL: http://svn.apache.org/viewvc?rev=1817693&view=rev
Log:
Fixed: Used entityName instead of null while using FormFactory.readFormDocument
method, as this parameter is used to prepare formLocationCache, and its causing
issue to view different entity from webtools. Now form will be cached based on
enittyName#formName so it will working fine for all possible scenaraio
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy?rev=1817693&r1=1817692&r2=1817693&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/groovyScripts/entity/FindGeneric.groovy
Sun Dec 10 11:07:07 2017
@@ -65,7 +65,7 @@ if (modelEntity) {
}
dynamicAutoEntityFieldSearchForm = dynamicAutoEntityFieldSearchForm +
'</form></forms>'
Document dynamicAutoEntityFieldSearchFormXml =
UtilXml.readXmlDocument(dynamicAutoEntityFieldSearchForm, true, true)
- Map<String, ModelForm> modelFormMap =
FormFactory.readFormDocument(dynamicAutoEntityFieldSearchFormXml,
entityModelReader, dispatcher.getDispatchContext(), null)
+ Map<String, ModelForm> modelFormMap =
FormFactory.readFormDocument(dynamicAutoEntityFieldSearchFormXml,
entityModelReader, dispatcher.getDispatchContext(), entityName)
if (UtilValidate.isNotEmpty(modelFormMap)) {
Map.Entry<String, ModelForm> entry =
modelFormMap.entrySet().iterator().next()
modelForm = entry.getValue()
@@ -96,7 +96,7 @@ if (modelEntity) {
'</form></forms>'
//Debug.logInfo(dynamicAutoEntityFieldForm, "")
Document dynamicAutoEntityFieldListFormXml =
UtilXml.readXmlDocument(dynamicAutoEntityFieldListForm, true, true)
- modelFormMap =
FormFactory.readFormDocument(dynamicAutoEntityFieldListFormXml,
entityModelReader, dispatcher.getDispatchContext(), null)
+ modelFormMap =
FormFactory.readFormDocument(dynamicAutoEntityFieldListFormXml,
entityModelReader, dispatcher.getDispatchContext(), entityName)
if (UtilValidate.isNotEmpty(modelFormMap)) {
Map.Entry<String, ModelForm> entry =
modelFormMap.entrySet().iterator().next()
modelForm = entry.getValue()
