svn commit: r1747350 - in /ofbiz/branches/release15.12: ./ applications/content/config/ContentErrorUiLabels.xml specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy

Author: jleroux
Date: Wed Jun  8 05:12:54 2016
New Revision: 1747350

URL: http://svn.apache.org/viewvc?rev=1747350&view=rev
Log:
"Applied fix from trunk for revision: 1747349  "
------------------------------------------------------------------------
r1747349 | jleroux | 2016-06-08 07:10:30 +0200 (mer. 08 juin 2016) | 12 lignes

A patch from Nameet Jain for "CMS throws error on clicking Find button" https://issues.apache.org/jira/browse/OFBIZ-7104

Steps to regenerate
1. Open the content app
2.  Click the CMS menu or use the link
       https://localhost:8443/content/control/CMSContentFind
3. Click on Find submenu or use link
      https://localhost:8443/content/control/AdminSearch

The error is due to missing content index. We can improve the error message to guide user to index the content first. ContentErrorUiLabels.xml

jleroux: I just moved the label to be sorted right and added a French one
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/content/config/ContentErrorUiLabels.xml
    ofbiz/branches/release15.12/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  8 05:12:54 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,1746422,
 1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,1746422,
 1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349

Modified: ofbiz/branches/release15.12/applications/content/config/ContentErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/config/ContentErrorUiLabels.xml?rev=1747350&r1=1747349&r2=1747350&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/config/ContentErrorUiLabels.xml (original)
+++ ofbiz/branches/release15.12/applications/content/config/ContentErrorUiLabels.xml Wed Jun  8 05:12:54 2016
@@ -54,6 +54,10 @@
         <value xml:lang="zh">你没有足够的权限 ${updateMode} 目录 (需要CONTENTMGR_${updateMode} 或 CONTENTMGR_ADMIN)。</value>
         <value xml:lang="zh-TW">您沒有足夠的權限 ${updateMode} 目錄 (需要CONTENTMGR_${updateMode} 或 CONTENTMGR_ADMIN).</value>
     </property>
+    <property key="ContentSearchNotIndexed">
+        <value xml:lang="en">Cannot find content search document. Please index all content.</value>
+        <value xml:lang="fr">Les contenus ne sont pas encore indexés, aucun résultat possible.</value>
+    </property>    
     <property key="dataEvents.error_call_create_service">
         <value xml:lang="da">Fejl ved kald af service createDataResource</value>
         <value xml:lang="de">Fehler beim Aufruf createDataResource Service</value>

Modified: ofbiz/branches/release15.12/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy?rev=1747350&r1=1747349&r2=1747350&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy (original)
+++ ofbiz/branches/release15.12/specialpurpose/lucene/webapp/content/WEB-INF/actions/Search.groovy Wed Jun  8 05:12:54 2016
@@ -27,6 +27,7 @@ import org.ofbiz.content.search.SearchWo
 import org.ofbiz.product.feature.ParametricSearch
 import org.apache.lucene.search.*
 import org.apache.lucene.index.DirectoryReader
+import org.ofbiz.base.util.UtilProperties;
 
 queryLine = parameters.queryLine;
 
@@ -45,7 +46,7 @@ try {
     searcher = new IndexSearcher(reader);
     analyzer = new StandardAnalyzer();
 } catch (java.io.FileNotFoundException e) {
-    context.errorMessageList.add(e.getMessage());
+    context.errorMessageList.add(UtilProperties.getMessage("ContentErrorUiLabels", "ContentSearchNotIndexed", locale));
     return;
 }