OFBiz › OFBiz - Commits

svn commit: r995994 - in /ofbiz/branches/jquery: ./ applications/content/src/org/ofbiz/content/content/ applications/content/src/org/ofbiz/content/search/ applications/order/script/org/ofbiz/order/customer/ applications/order/webapp/ordermgr/WEB-INF/ a...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r995994 - in /ofbiz/branches/jquery: ./ applications/content/src/org/ofbiz/content/content/ applications/content/src/org/ofbiz/content/search/ applications/order/script/org/ofbiz/order/customer/ applications/order/webapp/ordermgr/WEB-INF/ a...

Author: jleroux
Date: Fri Sep 10 21:59:40 2010
New Revision: 995994

URL: http://svn.apache.org/viewvc?rev=995994&view=rev
Log:
Merges the trunk at r995981

Modified:
ofbiz/branches/jquery/ (props changed)
ofbiz/branches/jquery/NOTICE
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchEvents.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchServices.java
ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchWorker.java
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
ofbiz/branches/jquery/applications/party/widget/partymgr/ProfileScreens.xml
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
ofbiz/branches/jquery/applications/workeffort/widget/CommonScreens.xml
ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed)
ofbiz/branches/jquery/framework/example/widget/example/PortletScreens.xml
ofbiz/branches/jquery/framework/images/webapp/images/selectall.js
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
ofbiz/branches/jquery/specialpurpose/projectmgr/widget/TaskScreens.xml

Propchange: ofbiz/branches/jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 21:59:40 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-995684
+/ofbiz/trunk:951708-995991

Modified: ofbiz/branches/jquery/NOTICE
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/NOTICE?rev=995994&r1=995993&r2=995994&view=diff
==============================================================================
--- ofbiz/branches/jquery/NOTICE (original)
+++ ofbiz/branches/jquery/NOTICE Fri Sep 10 21:59:40 2010
@@ -4,7 +4,7 @@
=========================================================================

The Apache Open For Business Project (Apache OFBiz)
-Copyright 2001-2008 The Apache Software Foundation
+Copyright 2001-2010 The Apache Software Foundation

=========================================================================
== Apache General Notice (Covers OFBiz and all ASF libraries) ==

Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=995994&r1=995993&r2=995994&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/content/ContentWorker.java Fri Sep 10 21:59:40 2010
@@ -747,7 +747,7 @@ public class ContentWorker implements or
return isWhen;
}

- public static List getAssociatedContent(GenericValue currentContent, String linkDir, List assocTypes, List contentTypes, String fromDate, String thruDate)
+ public static List<GenericValue> getAssociatedContent(GenericValue currentContent, String linkDir, List assocTypes, List contentTypes, String fromDate, String thruDate)
throws GenericEntityException {

Delegator delegator = currentContent.getDelegator();

Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchEvents.java?rev=995994&r1=995993&r2=995994&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchEvents.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchEvents.java Fri Sep 10 21:59:40 2010
@@ -28,6 +28,7 @@ import javolution.util.FastMap;

import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.StringUtil;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilHttp;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.entity.GenericValue;
@@ -46,13 +47,13 @@ public class SearchEvents {

public static String indexTree(HttpServletRequest request, HttpServletResponse response) {

- Map result;
- Map serviceInMap = FastMap.newInstance();
+ Map<String, Object> result;
+ Map<String, Object> serviceInMap = FastMap.newInstance();
HttpSession session = request.getSession();
GenericValue userLogin = (GenericValue)session.getAttribute("userLogin");
serviceInMap.put("userLogin", userLogin);
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
- Map paramMap = UtilHttp.getParameterMap(request);
+ Map<String, Object> paramMap = UtilHttp.getParameterMap(request);
String siteId = (String)paramMap.get("contentId");
serviceInMap.put("contentId", siteId);
try {
@@ -67,7 +68,7 @@ public class SearchEvents {
if (Debug.infoOn()) Debug.logInfo("errMsg:" + errMsg, module);
if (Debug.infoOn()) Debug.logInfo("result:" + result, module);
if (UtilValidate.isEmpty(errMsg)) {
- List badIndexList = (List)result.get("badIndexList");
+ List<String> badIndexList = UtilGenerics.checkList(result.get("badIndexList"));
if (Debug.infoOn()) Debug.logInfo("badIndexList:" + badIndexList, module);
String badIndexMsg = StringUtil.join(badIndexList, "\n") + badIndexList.size() + " entities not indexed";
Integer goodIndexCount = (Integer)result.get("goodIndexCount");

Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchServices.java?rev=995994&r1=995993&r2=995994&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchServices.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchServices.java Fri Sep 10 21:59:40 2010
@@ -44,14 +44,14 @@ public class SearchServices {

String siteId = (String) context.get("contentId");
String path = (String) context.get("path");
- Map envContext = FastMap.newInstance();
+ Map<String, Object> envContext = FastMap.newInstance();

if (Debug.infoOn()) Debug.logInfo("in indexTree, siteId:" + siteId, module);
- List badIndexList = FastList.newInstance();
+ List<String> badIndexList = FastList.newInstance();
envContext.put("badIndexList", badIndexList);
envContext.put("goodIndexCount", Integer.valueOf(0));

- Map results;
+ Map<String, Object> results;
try {
results = SearchWorker.indexTree(dispatcher, delegator, siteId, envContext, path);
} catch (Exception e) {

Modified: ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchWorker.java?rev=995994&r1=995993&r2=995994&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchWorker.java (original)
+++ ofbiz/branches/jquery/applications/content/src/org/ofbiz/content/search/SearchWorker.java Fri Sep 10 21:59:40 2010
@@ -28,6 +28,7 @@ import javolution.util.FastMap;

import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
+import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
@@ -52,74 +53,71 @@ public class SearchWorker {

public static final String module = SearchWorker.class.getName();

- public static Map indexTree(LocalDispatcher dispatcher, Delegator delegator, String siteId, Map context, String path) throws Exception {
+ public static Map<String, Object> indexTree(LocalDispatcher dispatcher, Delegator delegator, String siteId, Map<String, Object> context, String path) throws Exception {

- Map results = FastMap.newInstance();
- GenericValue content = delegator.makeValue("Content", UtilMisc.toMap("contentId", siteId));
- if (Debug.infoOn()) Debug.logInfo("in indexTree, siteId:" + siteId + " content:" + content, module);
- List siteList = ContentWorker.getAssociatedContent(content, "From", UtilMisc.toList("SUBSITE", "PUBLISH_LINK"), null, UtilDateTime.nowTimestamp().toString(), null);
- //if (Debug.infoOn()) Debug.logInfo("in indexTree, siteList:" + siteList, module);
- if (siteList != null) {
- Iterator iter = siteList.iterator();
- while (iter.hasNext()) {
- GenericValue siteContent = (GenericValue)iter.next();
- String siteContentId = siteContent.getString("contentId");
- List subContentList = ContentWorker.getAssociatedContent(siteContent, "From", UtilMisc.toList("SUBSITE", "PUBLISH_LINK", "SUB_CONTENT"), null, UtilDateTime.nowTimestamp().toString(), null);
- //if (Debug.infoOn()) Debug.logInfo("in indexTree, subContentList:" + subContentList, module);
- if (subContentList != null) {
- List contentIdList = FastList.newInstance();
- Iterator iter2 = subContentList.iterator();
- while (iter2.hasNext()) {
- GenericValue subContent = (GenericValue)iter2.next();
- contentIdList.add(subContent.getString("contentId"));
- }
- //if (Debug.infoOn()) Debug.logInfo("in indexTree, contentIdList:" + contentIdList, module);
- indexContentList(contentIdList, delegator, dispatcher, context);
-
- String subSiteId = siteContent.getString("contentId");
- indexTree(dispatcher, delegator, subSiteId, context, path);
- } else {
- List badIndexList = (List)context.get("badIndexList");
- badIndexList.add(siteContentId + " had no sub-entities.");
+ Map<String, Object> results = FastMap.newInstance();
+ GenericValue content = delegator.makeValue("Content", UtilMisc.toMap("contentId", siteId));
+ if (Debug.infoOn()) Debug.logInfo("in indexTree, siteId:" + siteId + " content:" + content, module);
+ List<GenericValue> siteList = ContentWorker.getAssociatedContent(content, "From", UtilMisc.toList("SUBSITE", "PUBLISH_LINK"), null, UtilDateTime.nowTimestamp().toString(), null);
+
+ if (siteList != null) {
+ Iterator<GenericValue> iter = siteList.iterator();
+ while (iter.hasNext()) {
+ GenericValue siteContent = iter.next();
+ String siteContentId = siteContent.getString("contentId");
+ List<GenericValue> subContentList = ContentWorker.getAssociatedContent(siteContent, "From", UtilMisc.toList("SUBSITE", "PUBLISH_LINK", "SUB_CONTENT"), null, UtilDateTime.nowTimestamp().toString(), null);
+
+ if (subContentList != null) {
+ List<String> contentIdList = FastList.newInstance();
+ Iterator<GenericValue> iter2 = subContentList.iterator();
+ while (iter2.hasNext()) {
+ GenericValue subContent = iter2.next();
+ contentIdList.add(subContent.getString("contentId"));
}
+
+ indexContentList(contentIdList, delegator, dispatcher, context);
+
+ String subSiteId = siteContent.getString("contentId");
+ indexTree(dispatcher, delegator, subSiteId, context, path);
+ } else {
+ List<String> badIndexList = UtilGenerics.checkList(context.get("badIndexList"));
+ badIndexList.add(siteContentId + " had no sub-entities.");
}
- } else {
- List badIndexList = (List)context.get("badIndexList");
- badIndexList.add(siteId + " had no sub-entities.");
}
- results.put("badIndexList", context.get("badIndexList"));
- results.put("goodIndexCount", context.get("goodIndexCount"));
- //if (Debug.infoOn()) Debug.logInfo("in indexTree, results:" + results, module);
- return results;
+ } else {
+ List<String> badIndexList = UtilGenerics.checkList(context.get("badIndexList"));
+ badIndexList.add(siteId + " had no sub-entities.");
}
+ results.put("badIndexList", context.get("badIndexList"));
+ results.put("goodIndexCount", context.get("goodIndexCount"));
+
+ return results;
+ }

- public static void indexContentList(List idList, Delegator delegator, LocalDispatcher dispatcher, Map context) throws Exception {
+ public static void indexContentList(List<String> idList, Delegator delegator, LocalDispatcher dispatcher, Map<String, Object> context) throws Exception {
String path = null;
indexContentList(dispatcher, delegator, context, idList, path);
}

- public static void indexContentList(LocalDispatcher dispatcher, Delegator delegator, Map context, List idList, String path) throws Exception {
+ public static void indexContentList(LocalDispatcher dispatcher, Delegator delegator, Map<String, Object> context, List<String> idList, String path) throws Exception {
String indexAllPath = getIndexPath(path);
- if (Debug.infoOn())
- Debug.logInfo("in indexContent, indexAllPath:" + indexAllPath, module);
+ if (Debug.infoOn()) Debug.logInfo("in indexContent, indexAllPath:" + indexAllPath, module);
GenericValue content = null;
// Delete existing documents
- Iterator iter = null;
- List contentList = null;
+ Iterator<String> iter = null;
+ List<GenericValue> contentList = null;
IndexReader reader = null;
try {
reader = IndexReader.open(indexAllPath);
} catch (Exception e) {
// ignore
}
- //if (Debug.infoOn()) Debug.logInfo("in indexContent, reader:" +
- // reader, module);
+
contentList = FastList.newInstance();
iter = idList.iterator();
while (iter.hasNext()) {
- String id = (String) iter.next();
- if (Debug.infoOn())
- Debug.logInfo("in indexContent, id:" + id, module);
+ String id = iter.next();
+ if (Debug.infoOn()) Debug.logInfo("in indexContent, id:" + id, module);
try {
content = delegator.findByPrimaryKeyCache("Content", UtilMisc .toMap("contentId", id));
if (content != null) {
@@ -143,89 +141,83 @@ public class SearchWorker {
} catch (Exception e) {
writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED);
}
- //if (Debug.infoOn()) Debug.logInfo("in indexContent, writer:" +
- // writer, module);
- iter = contentList.iterator();
- while (iter.hasNext()) {
- content = (GenericValue) iter.next();
+
+ Iterator<GenericValue> contentListIter = contentList.iterator();
+ while (contentListIter.hasNext()) {
+ content = contentListIter.next();
indexContent(dispatcher, delegator, context, content, writer);
}
writer.optimize();
writer.close();
}

-
public static void deleteContentDocument(GenericValue content, String path) throws Exception {
String indexAllPath = null;
indexAllPath = getIndexPath(path);
IndexReader reader = IndexReader.open(indexAllPath);
- deleteContentDocument(content, reader);
- reader.close();
+ deleteContentDocument(content, reader);
+ reader.close();
}

public static void deleteContentDocument(GenericValue content, IndexReader reader) throws Exception {
- String contentId = content.getString("contentId");
+ String contentId = content.getString("contentId");
Term term = new Term("contentId", contentId);
if (Debug.infoOn()) Debug.logInfo("in indexContent, term:" + term, module);
int qtyDeleted = reader.deleteDocuments(term);
- if (Debug.infoOn()) Debug.logInfo("in indexContent, qtyDeleted:" + term, module);
+ if (Debug.infoOn()) Debug.logInfo("in indexContent, qtyDeleted:" + qtyDeleted, module);
String dataResourceId = content.getString("dataResourceId");
if (dataResourceId != null) {
deleteDataResourceDocument(dataResourceId, reader);
}
-
}

-
public static void deleteDataResourceDocument(String dataResourceId, IndexReader reader) throws Exception {
Term term = new Term("dataResourceId", dataResourceId);
if (Debug.infoOn()) Debug.logInfo("in indexContent, term:" + term, module);
int qtyDeleted = reader.deleteDocuments(term);
- if (Debug.infoOn()) Debug.logInfo("in indexContent, qtyDeleted:" + term, module);
-
+ if (Debug.infoOn()) Debug.logInfo("in indexContent, qtyDeleted:" + qtyDeleted, module);
}

- public static void indexContent(LocalDispatcher dispatcher, Delegator delegator, Map context, GenericValue content, String path) throws Exception {
+ public static void indexContent(LocalDispatcher dispatcher, Delegator delegator, Map<String, Object> context, GenericValue content, String path) throws Exception {
String indexAllPath = getIndexPath(path);
IndexWriter writer = null;
try {
- writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED);
- if (Debug.infoOn()) Debug.logInfo("Used old directory:" + indexAllPath, module);
+ writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED);
+ if (Debug.infoOn()) Debug.logInfo("Used old directory:" + indexAllPath, module);
} catch (FileNotFoundException e) {
- writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED);
- if (Debug.infoOn()) Debug.logInfo("Created new directory:" + indexAllPath, module);
+ writer = new IndexWriter(indexAllPath, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED);
+ if (Debug.infoOn()) Debug.logInfo("Created new directory:" + indexAllPath, module);
}

indexContent(dispatcher, delegator, context, content, writer);
- writer.optimize();
+ writer.optimize();
writer.close();
}

- public static void indexContent(LocalDispatcher dispatcher, Delegator delegator, Map context, GenericValue content, IndexWriter writer) throws Exception {
+ public static void indexContent(LocalDispatcher dispatcher, Delegator delegator, Map<String, Object> context, GenericValue content, IndexWriter writer) throws Exception {
Document doc = ContentDocument.Document(content, context, dispatcher);
- //if (Debug.infoOn()) Debug.logInfo("in indexContent, content:" + content, module);
- if (doc != null) {
- writer.addDocument(doc);
- Integer goodIndexCount = (Integer)context.get("goodIndexCount");
- int newCount = goodIndexCount.intValue() + 1;
- Integer newIndexCount = Integer.valueOf(newCount);
- context.put("goodIndexCount", newIndexCount);
- }
- /*
+
+ if (doc != null) {
+ writer.addDocument(doc);
+ Integer goodIndexCount = (Integer)context.get("goodIndexCount");
+ int newCount = goodIndexCount.intValue() + 1;
+ Integer newIndexCount = Integer.valueOf(newCount);
+ context.put("goodIndexCount", newIndexCount);
+ }
+ /*
String dataResourceId = content.getString("dataResourceId");
if (UtilValidate.isNotEmpty(dataResourceId)) {
indexDataResource(delegator, context, dataResourceId, writer);
}
- */
-
+ */
}

- public static void indexDataResource(Delegator delegator, Map context, String id) throws Exception {
+ public static void indexDataResource(Delegator delegator, Map<String, Object> context, String id) throws Exception {
String path = null;
indexDataResource(delegator, context, id, path);
}

- public static void indexDataResource(Delegator delegator, Map context, String id, String path) throws Exception {
+ public static void indexDataResource(Delegator delegator, Map<String, Object> context, String id, String path) throws Exception {
String indexAllPath = getIndexPath(path);
IndexWriter writer = null;
try {
@@ -236,21 +228,18 @@ public class SearchWorker {
indexDataResource(delegator, context, id, writer);
writer.optimize();
writer.close();
-
}

- public static void indexDataResource(Delegator delegator, Map context, String id, IndexWriter writer) throws Exception {
+ public static void indexDataResource(Delegator delegator, Map<String, Object> context, String id, IndexWriter writer) throws Exception {
Document doc = DataResourceDocument.Document(id, delegator, context);
writer.addDocument(doc);
}

public static String getIndexPath(String path) {
String indexAllPath = path;
- if (UtilValidate.isEmpty(indexAllPath))
- indexAllPath = UtilProperties.getPropertyValue("search", "defaultIndex");
- if (UtilValidate.isEmpty(indexAllPath))
- indexAllPath = "index";
+ if (UtilValidate.isEmpty(indexAllPath)) {
+ indexAllPath = UtilProperties.getPropertyValue("search", "defaultIndex", "index");
+ }
return indexAllPath;
-
}
}

Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 21:59:40 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
-/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-995684
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-995991

Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=995994&r1=995993&r2=995994&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/controller.xml Fri Sep 10 21:59:40 2010
@@ -1705,6 +1705,27 @@ under the License.
<response name="success" type="view" value="showcart"/>
<response name="error" type="view" value="showcart"/>
</request-map>
+
+ <request-map uri="clearSearchOptionsHistoryList">
+ <security https="true" auth="true"/>
+ <event type="java" path="org.ofbiz.product.product.ProductSearchSession" invoke="clearSearchOptionsHistoryList"/>
+ <response name="success" type="view" value="advancedsearch"/>
+ <response name="error" type="view" value="advancedsearch"/>
+ </request-map>
+ <request-map uri="setCurrentSearchFromHistory">
+ <security https="true" auth="true"/>
+ <event type="java" path="org.ofbiz.product.product.ProductSearchSession" invoke="setCurrentSearchFromHistory"/>
+ <response name="success" type="view" value="advancedsearch"/>
+ <response name="error" type="view" value="advancedsearch"/>
+ </request-map>
+ <request-map uri="setCurrentSearchFromHistoryAndSearch">
+ <security https="true" auth="true"/>
+ <event type="java" path="org.ofbiz.product.product.ProductSearchSession" invoke="setCurrentSearchFromHistory"/>
+ <response name="success" type="request" value="keywordsearch"/>
+ <response name="error" type="view" value="advancedsearch"/>
+ </request-map>
+
+

<script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
</actions>
@@ -36,6 +37,9 @@ under the License.

<screen name="ExamplePortlet2">
<section>
+ <actions>
+ <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/>
+ </actions>
<widgets>
<label text="${uiLabelMap.ExamplePortletSecond}"/>
</widgets>
@@ -45,6 +49,7 @@ under the License.
<screen name="ExamplePortlet3">
<section>
<actions>
+ <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://common/webcommon/WEB-INF/actions/includes/retrievePortletAttributes.groovy"/>
</actions>
<widgets>

Modified: ofbiz/branches/jquery/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/selectall.js?rev=995994&r1=995993&r2=995994&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/branches/jquery/framework/images/webapp/images/selectall.js Fri Sep 10 21:59:40 2010
@@ -424,6 +424,7 @@ function setLookDescription(textFieldId,
if (description) {
var start = description.lastIndexOf(' [');
if (start != -1) {
+ /* this breaks many existing fields, so commenting for now: assumes main field is the name field and id field is hidden, determines Name/Id fields based on name instead of using description-field-name attribute
// To allow to set a dependent Id field when using a Name field as a lookup (the fields must have the same prefix, eg: partyName, partyId)
// It uses the description (Id) shown with the Name. Hence the Lookup screen must be set in order to show a description in the autocomplete part.
// It seems this is not always easy notably when you need to show at least 2 parts for the Name (eg Person).
@@ -438,9 +439,12 @@ function setLookDescription(textFieldId,
if ($(dependentId)) {
$(dependentId).value = dependentIdValue;
}
+ */

description = description.substring(0, start);
+ /*
$(dependentId).value = description;
+ */
}
}
var lookupWrapperEl = jQuery("#" + textFieldId).closest(jQuery('.field-lookup'));

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=995994&r1=995993&r2=995994&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Fri Sep 10 21:59:40 2010
@@ -518,6 +518,9 @@ public class HtmlFormRenderer extends Ht
ModelFormField modelFormField = dateTimeField.getModelFormField();
String paramName = modelFormField.getParameterName(context);
String defaultDateTimeString = dateTimeField.getDefaultDateTimeString(context);
+
+ String event = modelFormField.getEvent();
+ String action = modelFormField.getAction(context);

Map<String, String> uiLabelMap = UtilGenerics.checkMap(context.get("uiLabelMap"));
if (uiLabelMap == null) {
@@ -587,6 +590,14 @@ public class HtmlFormRenderer extends Ht
writer.append(idName);
writer.append('"');
}
+
+ if (UtilValidate.isNotEmpty(event) && UtilValidate.isNotEmpty(action)) {
+ writer.append(" ");
+ writer.append(event);
+ writer.append("=\"");
+ writer.append(action);
+ writer.append('"');
+ }

writer.append("/>");

@@ -835,7 +846,6 @@ public class HtmlFormRenderer extends Ht
writer.append(")\" ");
}

-
if (UtilValidate.isNotEmpty(event) && UtilValidate.isNotEmpty(action)) {
writer.append(" ");
writer.append(event);

Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 21:59:40 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-995684
+/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-995991

Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 21:59:40 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-995684
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-995991

Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 21:59:40 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-995684
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-995991

Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 21:59:40 2010
@@ -1,3 +1,3 @@
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-995684
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-995991

Modified: ofbiz/branches/jquery/specialpurpose/projectmgr/widget/TaskScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=995994&r1=995993&r2=995994&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/projectmgr/widget/TaskScreens.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/projectmgr/widget/TaskScreens.xml Fri Sep 10 21:59:40 2010
@@ -125,6 +125,7 @@ under the License.
<screen name="MyTaskList">
<section>
<actions>
+ <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
<entity-and entity-name="WorkEffortAndPartyAssign" list="tasks" filter-by-date="true">
<field-map field-name="partyId" from-field="userLogin.partyId"/>
<field-map field-name="workEffortTypeId" value="TASK"/>