Author: jleroux
Date: Thu Sep 22 12:40:37 2016
New Revision: 1761940
URL:
http://svn.apache.org/viewvc?rev=1761940&view=revLog:
Fixes: webtools label search widget issue
(OFBIZ-8315)
go to
https://localhost:8443/webtools/control/SearchLabelsclick find to show entries
click on a link in the listing
shows error page...
This bug was introduced while working on OFBIZ-8154 (still WIP)
Thanks: Wai for report
Modified:
ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/UpdateManager.groovy
ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/ViewReferences.groovy
Modified: ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/UpdateManager.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/UpdateManager.groovy?rev=1761940&r1=1761939&r2=1761940&view=diff==============================================================================
--- ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/UpdateManager.groovy (original)
+++ ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/UpdateManager.groovy Thu Sep 22 12:40:37 2016
@@ -21,7 +21,7 @@ import org.apache.ofbiz.entity.Delegator
import org.apache.ofbiz.webtools.labelmanager.*;
LabelManagerFactory factory = LabelManagerFactory.getInstance();
-factory.findMatchingLabels(null, parameters.sourceFileName, parameters.sourceKey, null)
+factory.findMatchingLabels(null, parameters.sourceFileName, parameters.sourceKey, null, false)
context.labels = factory.getLabels();
context.localesFound = factory.getLocalesFound();
context.filesFound = factory.getFilesFound();
Modified: ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/ViewReferences.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/ViewReferences.groovy?rev=1761940&r1=1761939&r2=1761940&view=diff==============================================================================
--- ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/ViewReferences.groovy (original)
+++ ofbiz/trunk/framework/webtools/groovyScripts/labelmanager/ViewReferences.groovy Thu Sep 22 12:40:37 2016
@@ -22,7 +22,7 @@ import org.apache.ofbiz.webtools.labelma
LabelManagerFactory factory = LabelManagerFactory.getInstance();
context.factory = factory;
-factory.findMatchingLabels(parameters.labelComponentName, parameters.labelFileName, parameters.sourceKey, parameters.labelLocaleName)
+factory.findMatchingLabels(parameters.labelComponentName, parameters.labelFileName, parameters.sourceKey, parameters.labelLocaleName, false)
context.labels = factory.getLabels();
context.labelsList = factory.getLabelsList();
context.localesFound = factory.getLocalesFound();