svn commit: r1838382 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy applications/product/groovyScripts/catalog/find/KeywordSearch.groovy

Author: jleroux
Date: Sun Aug 19 15:31:26 2018
New Revision: 1838382

URL: http://svn.apache.org/viewvc?rev=1838382&view=rev
Log:
"Applied fix from trunk for revision: 1838381  "
------------------------------------------------------------------------
r1838381 | jleroux | 2018-08-19 17:30:42 +0200 (dim. 19 août 2018) | 8 lignes

Fixed: Search in Ecommerce no longer works
(OFBIZ-10531)

I guess that when I worked on OFBIZ-9164 I broke that.

I found 3 occurences where the dispatcher was not in the session because the
session comes from the request and the request has not it in.

------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/groovyScripts/catalog/find/KeywordSearch.groovy

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 19 15:31:26 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy?rev=1838382&r1=1838381&r2=1838382&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/order/groovyScripts/entry/catalog/KeywordSearch.groovy Sun Aug 19 15:31:26 2018
@@ -28,6 +28,7 @@ import org.apache.ofbiz.product.product.
 module = "KeywordSearch.groovy"
 
 // note: this can be run multiple times in the same request without causing problems, will check to see on its own if it has run again
+request.getSession().setAttribute("dispatcher",dispatcher)
 ProductSearchSession.processSearchParameters(parameters, request)
 prodCatalogId = CatalogWorker.getCurrentCatalogId(request)
 result = ProductSearchSession.getProductSearchResult(request, delegator, prodCatalogId)

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/product/groovyScripts/catalog/find/KeywordSearch.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/groovyScripts/catalog/find/KeywordSearch.groovy?rev=1838382&r1=1838381&r2=1838382&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/groovyScripts/catalog/find/KeywordSearch.groovy (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/groovyScripts/catalog/find/KeywordSearch.groovy Sun Aug 19 15:31:26 2018
@@ -24,6 +24,7 @@ import org.apache.ofbiz.product.product.
 module = "KeywordSearch.groovy"
 
 // note: this can be run multiple times in the same request without causing problems, will check to see on its own if it has run again
+request.getSession().setAttribute("dispatcher",dispatcher)
 ProductSearchSession.processSearchParameters(parameters, request)
 prodCatalogId = CatalogWorker.getCurrentCatalogId(request)
 result = ProductSearchSession.getProductSearchResult(request, delegator, prodCatalogId)