You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/11/15 23:49:16 UTC
svn commit: r1639935 - in /ofbiz/branches/release12.04: ./
applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/
applications/product/webapp/catalog/WEB-INF/actions/find/
applications/product/webapp/catalog/find/
Author: jleroux
Date: Sat Nov 15 22:49:16 2014
New Revision: 1639935
URL: http://svn.apache.org/r1639935
Log:
"Applied fix from trunk for revision: 1639884"
------------------------------------------------------------------------
r1639884 | ashish | 2014-11-15 14:57:48 +0100 (sam. 15 nov. 2014) | 2 lignes
Applied patch from jira issue - OFBIZ-4655 - searchCategory is not available in results in keywordsearch.groovy
Thanks Kiran for reporting the issue and thanks Deepak for providing the patch for this issue.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy
ofbiz/branches/release12.04/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy
ofbiz/branches/release12.04/applications/product/webapp/catalog/find/keywordsearch.ftl
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1639884
Modified: ofbiz/branches/release12.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy?rev=1639935&r1=1639934&r2=1639935&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy (original)
+++ ofbiz/branches/release12.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/KeywordSearch.groovy Sat Nov 15 22:49:16 2014
@@ -42,6 +42,5 @@ context.lowIndex = result.lowIndex;
context.highIndex = result.highIndex;
context.paging = result.paging;
context.previousViewSize = result.previousViewSize;
-context.searchCategory = result.searchCategory;
context.searchConstraintStrings = result.searchConstraintStrings;
context.searchSortOrderString = result.searchSortOrderString;
Modified: ofbiz/branches/release12.04/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy?rev=1639935&r1=1639934&r2=1639935&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy (original)
+++ ofbiz/branches/release12.04/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy Sat Nov 15 22:49:16 2014
@@ -47,6 +47,5 @@ context.lowIndex = result.lowIndex;
context.highIndex = result.highIndex;
context.paging = result.paging;
context.previousViewSize = result.previousViewSize;
-context.searchCategory = result.searchCategory;
context.searchConstraintStrings = result.searchConstraintStrings;
context.searchSortOrderString = result.searchSortOrderString;
Modified: ofbiz/branches/release12.04/applications/product/webapp/catalog/find/keywordsearch.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/product/webapp/catalog/find/keywordsearch.ftl?rev=1639935&r1=1639934&r2=1639935&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/product/webapp/catalog/find/keywordsearch.ftl (original)
+++ ofbiz/branches/release12.04/applications/product/webapp/catalog/find/keywordsearch.ftl Sat Nov 15 22:49:16 2014
@@ -22,7 +22,7 @@ under the License.
</div>
<div class="screenlet-body">
<#list searchConstraintStrings as searchConstraintString>
- <div> <a href="<@o...@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div>
+ <div> <a href="<@o...@ofbizUrl>" class="buttontext">X</a> ${searchConstraintString}</div>
</#list>
<span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString}
<div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div>