From c6e88085d992ef1779ec3d63b5d38055739e1272 Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 21 Sep 2021 16:37:06 +0200 Subject: [PATCH 1/9] Get configured web site content root, else use default WebStoreCONTENT --- ecommerce/template/content/ContentCategories.ftl | 1 - ecommerce/widget/ContentScreens.xml | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ecommerce/template/content/ContentCategories.ftl b/ecommerce/template/content/ContentCategories.ftl index 305cebbd3..4fdbc5a51 100644 --- a/ecommerce/template/content/ContentCategories.ftl +++ b/ecommerce/template/content/ContentCategories.ftl @@ -16,7 +16,6 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<#assign contentRootId = "WebStoreCONTENT"/> <#-- variable setup and worker calls --> <#assign curCategoryId = requestAttributes.curCategoryId!> diff --git a/ecommerce/widget/ContentScreens.xml b/ecommerce/widget/ContentScreens.xml index 07ef0389d..5da0a85be 100644 --- a/ecommerce/widget/ContentScreens.xml +++ b/ecommerce/widget/ContentScreens.xml @@ -37,6 +37,15 @@ under the License.
+ + + + + + + + + From 8ff41adb136c79f6ce109f347d874763fc95e63f Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 21 Sep 2021 16:39:09 +0200 Subject: [PATCH 2/9] Get configured web site content root, else use default WebStoreCONTENT --- ecommerce/groovyScripts/content/Search.groovy | 2 +- ecommerce/widget/ContentScreens.xml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ecommerce/groovyScripts/content/Search.groovy b/ecommerce/groovyScripts/content/Search.groovy index 9c0b41afe..0dd11978a 100644 --- a/ecommerce/groovyScripts/content/Search.groovy +++ b/ecommerce/groovyScripts/content/Search.groovy @@ -36,7 +36,7 @@ paramMap = UtilHttp.getParameterMap(request) queryLine = paramMap.queryLine.toString() //logInfo("in search, queryLine:" + queryLine) -siteId = paramMap.siteId ?: "WebStoreCONTENT" +siteId = paramMap.siteId ?: defaultSiteId //logInfo("in search, siteId:" + siteId) featureIdByType = ParametricSearch.makeFeatureIdByTypeMap(paramMap) //logInfo("in search, featureIdByType:" + featureIdByType) diff --git a/ecommerce/widget/ContentScreens.xml b/ecommerce/widget/ContentScreens.xml index 5da0a85be..9a22948bc 100644 --- a/ecommerce/widget/ContentScreens.xml +++ b/ecommerce/widget/ContentScreens.xml @@ -135,7 +135,14 @@ under the License. - + + + + + + + +