You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/10/25 07:04:29 UTC
svn commit: r1401975 [26/29] - in /ofbiz/branches/20120329_portletWidget: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/script/org/ofbiz/accounting/...
Modified: ofbiz/branches/20120329_portletWidget/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/framework/widget/templates/htmlFormMacroLibrary.ftl Thu Oct 25 05:04:09 2012
@@ -158,13 +158,17 @@ under the License.
jQuery("#${id}_i18n").val(newValue);
});
jQuery("#${id}_i18n").change(function() {
- var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
- var newValue = ""
- if (this.value != "") {
- var dateObj = Date.parseExact(this.value, dateFormat);
- var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
+ var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>,
+ newValue = "",
+ dateObj = Date.parseExact(this.value, dateFormat),
+ ofbizTime;
+ if (this.value != "" && dateObj !== null) {
+ ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
newValue = dateObj.toString(ofbizTime);
}
+ else { // invalid input
+ jQuery("#${id}_i18n").val("");
+ }
jQuery("#${id}").val(newValue);
});
} else {
@@ -614,8 +618,8 @@ Parameter: width, String or Integer, opt
Parameter: height, String or Integer, optional - The height of the lookup field.
Parameter: position, String, optional - The position style of the lookup field.
Parameter: fadeBackground, ?
-Parameter: clearText, String, optional - If the readonly parameter is true, clearText contains the text to be displayed in the field.
-Parameter: showDescription, String, optional - ? (contains "true" or "false").
+Parameter: clearText, String, optional - If the readonly parameter is true, clearText contains the text to be displayed in the field, default is CommonClear label.
+Parameter: showDescription, String, optional - If the showDescription parameter is true, a special span with css class "tooltip" will be created at right of the lookup button and a description will fill in (see setLookDescription in selectall.js). For now not when the lookup is read only.
Parameter: initiallyCollapsed, Not used.
Parameter: lastViewName, String, optional - If the ajaxEnabled parameter is true, the contents of lastViewName will be appended to the Ajax URL.
-->
@@ -675,45 +679,56 @@ Parameter: lastViewName, String, optiona
</#if>
</#if>
</#if>
- <script type="text/javascript">
+ <script type="text/javascript">
jQuery(document).ready(function(){
- var options = {
- requestUrl : "${fieldFormName}",
- inputFieldId : "${id}",
- dialogTarget : document.${formName?html}.${name?html},
- dialogOptionalTarget : <#if descriptionFieldName?has_content>document.${formName?html}.${descriptionFieldName}<#else>null</#if>,
- formName : "${formName?html}",
- width : "${width}",
- height : "${height}",
- position : "${position}",
- modal : "${fadeBackground}",
- ajaxUrl : <#if ajaxEnabled?has_content && ajaxEnabled>"${ajaxUrl}"<#else>""</#if>,
- showDescription : <#if ajaxEnabled?has_content && ajaxEnabled>"${showDescription}"<#else>false</#if>,
- presentation : "${presentation!}",
- defaultMinLength : "${defaultMinLength!2}",
- defaultDelay : "${defaultDelay!300}",
- args : <#rt/>
- <#if targetParameterIter?has_content>
- <#assign isFirst = true>
- <#lt/>[<#rt/>
- <#list targetParameterIter as item>
- <#if isFirst>
- <#lt/>document.${formName}.${item}<#rt/>
- <#assign isFirst = false>
- <#else>
- <#lt/> ,document.${formName}.${item}<#rt/>
- </#if>
- </#list>
- <#lt/>]<#rt/>
- <#else>[]
- </#if>
- <#lt/>
- };
- new Lookup(options).init();
+ var options = {
+ requestUrl : "${fieldFormName}",
+ inputFieldId : "${id}",
+ dialogTarget : document.${formName?html}.${name?html},
+ dialogOptionalTarget : <#if descriptionFieldName?has_content>document.${formName?html}.${descriptionFieldName}<#else>null</#if>,
+ formName : "${formName?html}",
+ width : "${width}",
+ height : "${height}",
+ position : "${position}",
+ modal : "${fadeBackground}",
+ ajaxUrl : <#if ajaxEnabled?has_content && ajaxEnabled>"${ajaxUrl}"<#else>""</#if>,
+ showDescription : <#if ajaxEnabled?has_content && ajaxEnabled>"${showDescription}"<#else>false</#if>,
+ presentation : "${presentation!}",
+ defaultMinLength : "${defaultMinLength!2}",
+ defaultDelay : "${defaultDelay!300}",
+ args :
+ <#rt/>
+ <#if targetParameterIter?has_content>
+ <#assign isFirst = true>
+ <#lt/>[<#rt/>
+ <#list targetParameterIter as item>
+ <#if isFirst>
+ <#lt/>document.${formName}.${item}<#rt/>
+ <#assign isFirst = false>
+ <#else>
+ <#lt/> ,document.${formName}.${item}<#rt/>
+ </#if>
+ </#list>
+ <#lt/>]<#rt/>
+ <#else>[]
+ </#if>
+ <#lt/>
+ };
+ new Lookup(options).init();
});
</script>
</#if>
-<#if readonly?has_content && readonly><a id="${id}_clear" style="background:none;margin-left:5px;margin-right:15px;" class="clearField" href="javascript:void();" onclick="javascript:document.${formName}.${name}.value='';<#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">${clearText}</a></#if>
+<#if readonly?has_content && readonly>
+ <a id="${id}_clear"
+ style="background:none;margin-left:5px;margin-right:15px;"
+ class="clearField"
+ href="javascript:void(0);"
+ onclick="javascript:document.${formName}.${name}.value='';
+ jQuery('#' + jQuery('#${id}_clear').next().attr('id').replace('_button','') + '_${id}_lookupDescription').html('');
+ <#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">
+ <#if clearText?has_content>${clearText}<#else>${uiLabelMap.CommonClear}</#if>
+ </a>
+</#if>
</span>
<#if ajaxEnabled?has_content && ajaxEnabled && (presentation?has_content && presentation == "window")>
<#if ajaxUrl?index_of("_LAST_VIEW_NAME_") < 0>
Modified: ofbiz/branches/20120329_portletWidget/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/macros.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/macros.xml (original)
+++ ofbiz/branches/20120329_portletWidget/macros.xml Thu Oct 25 05:04:09 2012
@@ -90,7 +90,7 @@ under the License.
<presetdef name="default-javadoc">
<javadoc classpathref="local.class.path"
destdir="${build.dir}/javadocs"
- windowtitle="Open for Business - ${desc}"
+ windowtitle="Apache Open for Business - ${desc}"
useexternalfile="yes"
maxmemory="512M"
encoding="UTF-8"
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/birt/documents/Birt.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/birt/documents/Birt.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/birt/documents/Birt.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/birt/documents/Birt.xml Thu Oct 25 05:04:09 2012
@@ -17,15 +17,13 @@
specific language governing permissions and limitations
under the License.
-->
-<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0"
+ xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
xsi:schemaLocation="http://docbook.org/ns/docbook ../../applications/content/dtd/docbook.xsd"
xmlns="http://docbook.org/ns/docbook">
<title>BIRT report generator.</title>
+ <para> An example report sales can be found in the example component. </para>
<para>
- An example report sales can be found in the example component.
+ <xi:include href="../../../specialpurpose/birt/data/helpdata/HELP_BIRT.xml"/>
</para>
- <para>
- <xi:include href="../../../framework/birt/data/helpdata/HELP_BIRT.xml" />
- </para>
-</chapter>
\ No newline at end of file
+</chapter>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/birt/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/birt/ofbiz-component.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/birt/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/birt/ofbiz-component.xml Thu Oct 25 05:04:09 2012
@@ -28,7 +28,8 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/BirtHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/OrderPortletData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
-
+
+ <!-- use when reports need to be injected into applications Note: this will break context help for those applications.
<webapp name="accounting"
title="Accounting"
server="default-server"
@@ -49,7 +50,7 @@ under the License.
location="webapp/ordermgr"
base-permission="OFBTOOLS,ORDERMGR"
mount-point="/ordermgr"/>
- <!-- example -->
+ -->
<webapp name="birt"
title="BIRT"
server="default-server"
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/birt/webapp/birt/WEB-INF/web.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/birt/webapp/birt/WEB-INF/web.xml Thu Oct 25 05:04:09 2012
@@ -114,7 +114,7 @@ under the License.
-->
<context-param>
<param-name>BIRT_VIEWER_SCRIPTLIB_DIR</param-name>
- <param-value>${ofbiz.home}/framework/birt/lib/scriptlib</param-value>
+ <param-value>${ofbiz.home}/specialpurpose/birt/lib/scriptlib</param-value>
</context-param>
<!-- Resource location directory. Defaults to ${birt home} -->
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/build.xml Thu Oct 25 05:04:09 2012
@@ -39,7 +39,6 @@
birt/build.xml,
example/build.xml
"/>
- <!-- For the old OFBiz Workflow Engine add "workflow/build.xml" to the list above -->
<!-- ================================================================== -->
<!-- Removes all created files and directories -->
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/component-load.xml Thu Oct 25 05:04:09 2012
@@ -40,8 +40,4 @@ under the License.
<load-component component-location="birt"/>
<load-component component-location="example"/>
<load-component component-location="exampleext"/>
- <!-- The component below are not maintained by the community, or at least not very actively
- Still they are functional (or at least should be).
- So if you need them simply uncomment and have a look also in the build file -->
- <!-- <load-component component-location="workflow"/> -->
</component-loader>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoFinAccount.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoFinAccount.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoFinAccount.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoFinAccount.xml Thu Oct 25 05:04:09 2012
@@ -83,7 +83,7 @@
<ProductStoreSurveyAppl productStoreSurveyId="1100" productStoreId="9000" surveyApplTypeId="CART_ADD" surveyId="1100" productId="FA-001" fromDate="2003-11-24 16:00:02.467" surveyTemplate="/applications/content/template/survey/genericsurvey.ftl" lastUpdatedStamp="2003-12-04 21:40:23.27" lastUpdatedTxStamp="2003-12-04 21:40:20.607"/>
<!-- fulfillment service -->
- <Content contentId="FA_ACTIVATION" serviceName="createPartyFinAccountFromPurchase"/>
+ <Content contentId="FA_ACTIVATION" customMethodId="FIN_PURCH_OFBIZ"/>
<!-- associate the fulfillment service with the products -->
<ProductContent productId="FA-001" contentId="FA_ACTIVATION" productContentTypeId="FULFILLMENT_EXTASYNC" fromDate="2000-01-01 00:00:00"/>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoStoreGiftCertificateSettings.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoStoreGiftCertificateSettings.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoStoreGiftCertificateSettings.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoStoreGiftCertificateSettings.xml Thu Oct 25 05:04:09 2012
@@ -25,7 +25,7 @@ under the License.
purchaseSurveyId="1000" purchSurveySendTo="recipientEmail" purchSurveyCopyMe="copyMe" accountCodeLength="12" pinCodeLength="4" accountValidDays="365" authValidDays="30"/>
<!-- service for purchasing gift certificate configured as a Content and to be associated with products -->
- <Content contentId="GC_PURCHASE" serviceName="ofbGcPurchase"/>
+ <Content contentId="GC_PURCHASE" customMethodId="GIFT_PURCH_OFBIZ"/>
<!-- associate gift certificate purchase fulfillment services with products. virtual products ok. MUST be async fulfillment -
synchronous fulfillment can cause database lock problems -->
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/catalog/MiniProductSummary.groovy Thu Oct 25 05:04:09 2012
@@ -28,10 +28,11 @@ import org.ofbiz.product.config.ProductC
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.store.*;
import org.ofbiz.order.shoppingcart.*;
+import org.ofbiz.webapp.website.WebSiteWorker;
miniProduct = request.getAttribute("miniProduct");
optProductId = request.getAttribute("optProductId");
-webSiteId = CatalogWorker.getWebSiteId(request);
+webSiteId = WebSiteWorker.getWebSiteId(request);
prodCatalogId = CatalogWorker.getCurrentCatalogId(request);
productStoreId = ProductStoreWorker.getProductStoreId(request);
cart = ShoppingCartEvents.getCartObject(request);
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy Thu Oct 25 05:04:09 2012
@@ -24,7 +24,6 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.Term
import org.apache.lucene.queryParser.QueryParser
import org.apache.lucene.store.FSDirectory
-import org.apache.lucene.util.Version
import org.ofbiz.base.util.Debug
import org.ofbiz.base.util.UtilHttp
import org.ofbiz.content.search.SearchWorker
@@ -57,7 +56,7 @@ Searcher searcher = null;
Analyzer analyzer = null;
try {
searcher = new IndexSearcher(reader);
- analyzer = new StandardAnalyzer(Version.LUCENE_30);
+ analyzer = new StandardAnalyzer(SearchWorker.LUCENE_VERSION);
} catch (java.io.FileNotFoundException e) {
Debug.logError(e, "Search.groovy");
request.setAttribute("errorMsgReq", "No index file exists.");
@@ -69,7 +68,7 @@ combQuery.add(termQuery, BooleanClause.O
//Debug.logInfo("in search, combQuery(1):" + combQuery, "");
if (queryLine && analyzer) {
Query query = null;
- QueryParser parser = new QueryParser(Version.LUCENE_30, "content", analyzer);
+ QueryParser parser = new QueryParser(SearchWorker.LUCENE_VERSION, "content", analyzer);
query = parser.parse(queryLine);
combQuery.add(query, BooleanClause.Occur.MUST);
}
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy Thu Oct 25 05:04:09 2012
@@ -31,6 +31,7 @@ import org.ofbiz.entity.*;
import org.ofbiz.security.*;
import org.ofbiz.service.*;
import org.ofbiz.entity.model.*;
+import org.ofbiz.webapp.website.WebSiteWorker;
import org.ofbiz.widget.html.*;
import org.ofbiz.widget.form.*;
import org.ofbiz.securityext.login.*;
@@ -44,7 +45,7 @@ import javax.servlet.http.*;
paramMap = UtilHttp.getParameterMap(request);
forumId = null;
servletContext = session.getServletContext();
-rootForumId = servletContext.getAttribute("webSiteId");
+rootForumId = WebSiteWorker.getWebSiteId(request);
context.rootPubId = rootForumId;
session.setAttribute("rootPubId", rootForumId);
request.setAttribute("rootPubId", rootForumId);
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/CheckoutReview.groovy Thu Oct 25 05:04:09 2012
@@ -25,6 +25,7 @@ import org.ofbiz.order.order.*;
import org.ofbiz.party.contact.*;
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.store.*;
+import org.ofbiz.webapp.website.WebSiteWorker;
cart = session.getAttribute("shoppingCart");
context.cart = cart;
@@ -67,7 +68,7 @@ if (paymentMethodTypeIds) {
context.paymentMethodType = paymentMethodType;
}
-webSiteId = CatalogWorker.getWebSiteId(request);
+webSiteId = WebSiteWorker.getWebSiteId(request);
productStore = ProductStoreWorker.getProductStore(request);
context.productStore = productStore;
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/OrderStatus.groovy Thu Oct 25 05:04:09 2012
@@ -27,6 +27,7 @@ import org.ofbiz.order.order.*;
import org.ofbiz.party.contact.*;
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.store.*;
+import org.ofbiz.webapp.website.WebSiteWorker
orderId = parameters.orderId;
orderHeader = null;
@@ -147,7 +148,7 @@ if (orderHeader) {
}
}
- webSiteId = orderHeader.webSiteId ?: CatalogWorker.getWebSiteId(request);
+ webSiteId = orderHeader.webSiteId ?: WebSiteWorker.getWebSiteId(request);
payToPartyId = productStore.payToPartyId;
paymentAddress = PaymentWorker.getPaymentAddress(delegator, payToPartyId);
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/shoppinglist/EditShoppingList.groovy Thu Oct 25 05:04:09 2012
@@ -29,6 +29,7 @@ import org.ofbiz.party.contact.*;
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.store.*;
import org.ofbiz.service.calendar.*;
+import org.ofbiz.webapp.website.WebSiteWorker;
party = userLogin.getRelatedOne("Party", false);
@@ -37,7 +38,7 @@ currencyUomId = cart.getCurrency();
productStoreId = ProductStoreWorker.getProductStoreId(request);
prodCatalogId = CatalogWorker.getCurrentCatalogId(request);
-webSiteId = CatalogWorker.getWebSiteId(request);
+webSiteId = WebSiteWorker.getWebSiteId(request);
context.productStoreId = productStoreId;
context.currencyUomId = currencyUomId;
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl Thu Oct 25 05:04:09 2012
@@ -51,10 +51,12 @@ under the License.
}
}
function hideShowUsaStates() {
- if (document.getElementById('customerCountry').value == "USA" || document.getElementById('customerCountry').value == "UMI") {
- document.getElementById('customerState').style.display = "block";
+ var customerStateElement = document.getElementById('newuserform_stateProvinceGeoId');
+ var customerCountryElement = document.getElementById('newuserform_countryGeoId');
+ if (customerCountryElement.value == "USA" || customerCountryElement.value == "UMI") {
+ customerStateElement.style.display = "block";
} else {
- document.getElementById('customerState').style.display = "none";
+ customerStateElement.style.display = "none";
}
}
//]]>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/error/404.jsp Thu Oct 25 05:04:09 2012
@@ -20,10 +20,11 @@ under the License.
<%@ page import="org.ofbiz.base.util.*" %>
<%@ page import="org.ofbiz.entity.*" %>
<%@ page import="org.ofbiz.entity.util.*" %>
+<%@ page import="org.ofbiz.webapp.website.WebSiteWorker" %>
<jsp:useBean id="delegator" type="org.ofbiz.entity.GenericDelegator" scope="request" />
<%
ServletContext context = pageContext.getServletContext();
-String webSiteId = (String) context.getAttribute("webSiteId");
+String webSiteId = WebSiteWorker.getWebSiteId(request);
List<GenericValue> webAnalytics = delegator.findByAnd("WebAnalyticsConfig", UtilMisc.toMap("webSiteId", webSiteId), null, false);
%>
<html>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/CommonScreens.xml Thu Oct 25 05:04:09 2012
@@ -43,11 +43,11 @@ under the License.
<set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/>
<set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.0.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.16.custom.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.5.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.9.0.custom.min.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.2.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
@@ -262,7 +262,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.2.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml Thu Oct 25 05:04:09 2012
@@ -330,13 +330,11 @@
</property>
<property key="ExampleDefinitionFileTooltip">
<value xml:lang="en">framework/example/widget/example/FormWidgetExampleForms.xml</value>
- <value xml:lang="fr">framework/example/widget/example/FormWidgetExampleForms.xml</value>
- <value xml:lang="it">framework/example/widget/example/FormWidgetExampleForms.xml</value>
</property>
<property key="ExampleDefinitionName">
- <value xml:lang="en"> - see the form definition with name</value>
- <value xml:lang="fr"> - voir la défintion avec la form de nom </value>
- <value xml:lang="it"> - vedi la definizione della form con il nome</value>
+ <value xml:lang="en">See the form definition with name</value>
+ <value xml:lang="fr">Voir la défintion avec la form de nom </value>
+ <value xml:lang="it">Vedi la definizione della form con il nome</value>
<value xml:lang="zh"> - åè§è¡¨åå®ä¹ï¼å称为</value>
</property>
<property key="ExampleDependentDropDownTooltip">
@@ -581,9 +579,21 @@
<value xml:lang="it">Descrizione lunga</value>
<value xml:lang="zh">详ç»æè¿°</value>
</property>
- <property key="ExampleLookupFields">
- <value xml:lang="en">Lookup Fields: First of type popup, second layered and showing use of set_values underneath, ie returning not only Id but also another value. Both using also autocomplete</value>
- <value xml:lang="fr">Champs de recherche: le premier de type popup, le second de type layer avec usage sous-jacent de set_values qui permet de traiter non seulement une référence mais aussi une autre valeur. Les 2 utilisent aussi l'autocompletion</value>
+ <property key="ExampleLookupFields1">
+ <value xml:lang="en">Popup lookup field (old way, maybe be useful in some cases, notably if javascript is not enabled)</value>
+ <value xml:lang="fr">Champ de recherche type popup (ancienne manière, encore utile, notamment si javascript n'est pas disponible)</value>
+ </property>
+ <property key="ExampleLookupFields2">
+ <value xml:lang="en">Layered lookup field with autocompletion and description at right</value>
+ <value xml:lang="fr">Champs de recherche de type layer avec autocompletion et description à droite</value>
+ </property>
+ <property key="ExampleLookupFields3">
+ <value xml:lang="en">Read only layered lookup field, only the button is available</value>
+ <value xml:lang="fr">Champs de recherche de type layer en mode lecture seule, seul le bouton est utilisable</value>
+ </property>
+ <property key="ExampleLookupFields4">
+ <value xml:lang="en">Lookup Field of type layered and showing use of set_values underneath, ie returning not only Id but also another value. Both using also autocomplete</value>
+ <value xml:lang="fr">Champ de recherche de type layer avec usage sous-jacent de set_values qui permet de traiter non seulement une référence mais aussi une autre valeur. Les 2 utilisent aussi l'autocompletion</value>
</property>
<property key="ExampleLookupFieldsTitle">
<value xml:lang="en">Lookup Fields</value>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/servicedef/secas.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/servicedef/secas.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/servicedef/secas.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/servicedef/secas.xml Thu Oct 25 05:04:09 2012
@@ -23,8 +23,12 @@ under the License.
<eca service="createExample" event="return">
<action service="createExampleStatus" mode="sync"/>
</eca>
+ <!-- FIXME: This ECA assumes the updateExample service was called with a statusId parameter.
+ The condition should be improved to check for statusId being not empty. -->
+ <!--
<eca service="updateExample" event="return">
<condition-field field-name="statusId" operator="not-equals" to-field-name="oldStatusId"/>
<action service="createExampleStatus" mode="sync"/>
</eca>
+ -->
</service-eca>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/flot/flotPie.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/flot/flotPie.ftl?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/flot/flotPie.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/flot/flotPie.ftl Thu Oct 25 05:04:09 2012
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleForms.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleForms.xml Thu Oct 25 05:04:09 2012
@@ -30,7 +30,7 @@ under the License.
<!-- ***************** -->
<field name="field1"
title="${uiLabelMap.ExampleDateField1Title}"
- tooltip="${uiLabelMap.ExampleToDo}">
+ tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<date-time mask="Y"/>
</field>
<!-- ***************** -->
@@ -38,7 +38,7 @@ under the License.
<!-- ***************** -->
<field name="field9"
title="${uiLabelMap.ExampleDateField9Title}">
- <!--tooltip="${uiLabelMap.ExampleDateField9Tooltip}"-->
+ <!--tooltip="${uiLabelMap.ExampleDateField9Tooltip}" tooltip-style="button-text"-->
<date-time default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowTimestamp()}"/>
</field>
<!-- ***************** -->
@@ -46,7 +46,7 @@ under the License.
<!-- ***************** -->
<field name="field10"
title="${uiLabelMap.ExampleDateField10Title}"
- tooltip="${uiLabelMap.ExampleDateField10Tooltip}">
+ tooltip="${uiLabelMap.ExampleDateField10Tooltip}" tooltip-style="button-text">
<date-time default-value="${nowTimestamp}"/>
</field>
<!-- ***************** -->
@@ -54,7 +54,7 @@ under the License.
<!-- ***************** -->
<field name="field11"
title="${uiLabelMap.ExampleDateField11Title}"
- tooltip="${uiLabelMap.ExampleDateField11Tooltip}">
+ tooltip="${uiLabelMap.ExampleDateField11Tooltip}" tooltip-style="button-text">
<date-time default-value="${date:dayStart(nowTimestamp, timeZone, locale)}"/>
</field>
<!-- ***************** -->
@@ -62,7 +62,7 @@ under the License.
<!-- ***************** -->
<field name="field2"
title="${uiLabelMap.ExampleDateField2Title}"
- tooltip="${uiLabelMap.ExampleToDo}">
+ tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<date-time type="date"/>
</field>
<!-- ***************** -->
@@ -70,7 +70,7 @@ under the License.
<!-- ***************** -->
<field name="field3"
title="${uiLabelMap.ExampleDateField3Title}"
- tooltip="${uiLabelMap.ExampleToDo}">
+ tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<date-time type="time"/>
</field>
<!-- ***************** -->
@@ -78,7 +78,7 @@ under the License.
<!-- ***************** -->
<field name="field4"
title="${uiLabelMap.ExampleDateField4Title}"
- tooltip="${uiLabelMap.ExampleDateField4Tooltip}">
+ tooltip="${uiLabelMap.ExampleDateField4Tooltip}" tooltip-style="button-text">
<date-time input-method="time-dropdown" clock="24" default-value="${exampleDateField}"/>
</field>
<!-- ***************** -->
@@ -86,7 +86,7 @@ under the License.
<!-- ***************** -->
<field name="field5"
title="${uiLabelMap.ExampleDateField5Title}"
- tooltip="${uiLabelMap.ExampleDateField4Tooltip}">
+ tooltip="${uiLabelMap.ExampleDateField4Tooltip}" tooltip-style="button-text">
<date-time input-method="time-dropdown" clock="12" default-value="${exampleDateField}"/>
</field>
<!-- ***************** -->
@@ -95,7 +95,7 @@ under the License.
<field name="field6"
entry-name="exampleDateField"
title="${uiLabelMap.ExampleDateField6Title}"
- tooltip="${uiLabelMap.ExampleToDo}">
+ tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<display type="date-time"/>
</field>
<!-- ***************** -->
@@ -104,7 +104,7 @@ under the License.
<field name="field7"
entry-name="exampleDateField"
title="${uiLabelMap.ExampleDateField7Title}"
- tooltip="${uiLabelMap.ExampleDateField7Tooltip}">
+ tooltip="${uiLabelMap.ExampleDateField7Tooltip}" tooltip-style="button-text">
<display description="${groovy:org.ofbiz.base.util.UtilDateTime.toDateString(exampleDateField, "MM/dd/yyyy");}"/>
</field>
<!-- ***************** -->
@@ -113,7 +113,7 @@ under the License.
<field name="field8"
entry-name="exampleDateField"
title="${uiLabelMap.ExampleDateField8Title}"
- tooltip="${uiLabelMap.ExampleDateField8Tooltip}">
+ tooltip="${uiLabelMap.ExampleDateField8Tooltip}" tooltip-style="button-text">
<display description="${groovy:org.ofbiz.base.util.UtilDateTime.toDateString(exampleDateField, "MMMM,dd,yyyy");}"/>
</field>
<!-- ***************** -->
@@ -121,7 +121,7 @@ under the License.
<!-- ***************** -->
<field name="field12"
title="${uiLabelMap.ExampleDateField12Title}"
- tooltip="${uiLabelMap.ExampleDateField12Tooltip}">
+ tooltip="${uiLabelMap.ExampleDateField12Tooltip}" tooltip-style="button-text">
<date-time input-method="time-dropdown" clock="24" default-value="${exampleDateField}" step="5"/>
</field>
</form>
@@ -135,7 +135,7 @@ under the License.
<!-- ***************** -->
<field name="field1"
title="${uiLabelMap.ExampleDropDownField1Title}"
- tooltip="${uiLabelMap.ExampleDropDownField1Tooltip}">
+ tooltip="${uiLabelMap.ExampleDropDownField1Tooltip}" tooltip-style="button-text">
<drop-down allow-empty="true">
<option key="Y" description="${uiLabelMap.CommonY}"/>
<option key="N" description="${uiLabelMap.CommonN}"/>
@@ -146,7 +146,7 @@ under the License.
<!-- ***************** -->
<field name="field2"
title="${uiLabelMap.ExampleDropDownField2Title}"
- tooltip="${uiLabelMap.ExampleDropDownField2Tooltip}">
+ tooltip="${uiLabelMap.ExampleDropDownField2Tooltip}" tooltip-style="button-text">
<drop-down allow-empty="false"> <!-- allow-empty="false" is also the default value, so you can also not specify this attribute here -->
<option key="Y" description="${uiLabelMap.CommonY}"/>
<option key="N" description="${uiLabelMap.CommonN}"/>
@@ -157,7 +157,7 @@ under the License.
<!-- ***************** -->
<field name="field5"
title="${uiLabelMap.ExampleDropDownField5Title}"
- tooltip="${uiLabelMap.ExampleDropDownField5Tooltip}">
+ tooltip="${uiLabelMap.ExampleDropDownField5Tooltip}" tooltip-style="button-text">
<drop-down no-current-selected-key="N">
<option key="Y" description="${uiLabelMap.CommonY}"/>
<option key="N" description="${uiLabelMap.CommonN}"/>
@@ -170,7 +170,7 @@ under the License.
title="${uiLabelMap.ExampleDropDownField8Title}"
event="onchange"
action="return showErrorAlert('${uiLabelMap.CommonErrorMessage2}','${uiLabelMap.YouChangedTheSelectBoxValue}');"
- tooltip="${uiLabelMap.ExampleDropDownField8Tooltip}">
+ tooltip="${uiLabelMap.ExampleDropDownField8Tooltip}" tooltip-style="button-text">
<drop-down>
<option key="Y" description="${uiLabelMap.CommonY}"/>
<option key="N" description="${uiLabelMap.CommonN}"/>
@@ -185,7 +185,7 @@ under the License.
<!-- ***************** -->
<field name="field3"
title="${uiLabelMap.ExampleDropDownField3Title}"
- tooltip="${uiLabelMap.ExampleToDo}">
+ tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<drop-down>
<entity-options entity-name="ExampleType"
key-field-name="exampleTypeId"
@@ -199,7 +199,7 @@ under the License.
<!-- ***************** -->
<field name="field4"
title="${uiLabelMap.ExampleDropDownField4Title}"
- tooltip="${uiLabelMap.ExampleToDo}">
+ tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<drop-down>
<entity-options entity-name="ExampleType"
key-field-name="exampleTypeId"
@@ -213,7 +213,7 @@ under the License.
<!-- ***************** -->
<field name="exampleTypeId"
title="${uiLabelMap.ExampleDropDownField6Title}"
- tooltip="${uiLabelMap.ExampleToDo}">
+ tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<drop-down>
<entity-options entity-name="ExampleType"
description="${description}"/>
@@ -224,7 +224,7 @@ under the License.
<!-- ***************** -->
<field name="field7"
title="${uiLabelMap.ExampleDropDownField7Title}"
- tooltip="${uiLabelMap.ExampleToDo}">
+ tooltip="${uiLabelMap.ExampleToDo}" tooltip-style="button-text">
<drop-down>
<entity-options entity-name="ExampleType"
key-field-name="exampleTypeId"
@@ -242,7 +242,7 @@ under the License.
<!-- TODO : return only the Id, else you need to edit the field to remove the description -->
<field name="emptyField1" title=" "><display/></field>
<field name="geoId" title="${uiLabelMap.ExampleAutocompleteDropdown}"
- tooltip="${uiLabelMap.ExampleAutocompleteTooltip}">
+ tooltip="${uiLabelMap.ExampleAutocompleteTooltip}" tooltip-style="button-text">
<drop-down>
<auto-complete/>
<entity-options entity-name="Geo" description="${geoId}: ${geoName}">
@@ -341,22 +341,37 @@ under the License.
<!-- Lookup Examples -->
<form name="ExampleLookupFields" type="single" title="">
<!-- Old style lookup (in a popup window without autocompletion), geoIdAlone because we have another geoId below -->
- <field name="geoIdAlone" title="${uiLabelMap.CommonGeoId}">
+ <field name="geoIdAlone" title="${uiLabelMap.CommonGeoId}" tooltip="${uiLabelMap.ExampleLookupFields1}" tooltip-style="button-text">
<lookup target-form-name="LookupGeo" presentation="window"/>
</field>
<!-- Standard lookup (in a layer with autocompletion) -->
+ <field name="geoIdStd" title="${uiLabelMap.CommonGeoId}" tooltip="${uiLabelMap.ExampleLookupFields2}" tooltip-style="button-text">
+ <lookup target-form-name="LookupGeo"/>
+ </field>
+ <!-- Standard read only lookup (in a layer with autocompletion) -->
+ <field name="geoIdReadOnly" title="${uiLabelMap.CommonGeoId}" tooltip="${uiLabelMap.ExampleLookupFields3}" tooltip-style="button-text">
+ <lookup target-form-name="LookupGeo" read-only="true"/>
+ </field>
+ <!-- Standard lookup (in a layer with autocompletion) -->
<!-- passes the name in one field and the id in another, passing the id in the other field does not work yet with autocompletion, WIP... -->
- <field name="geoName" title="${uiLabelMap.CommonGeoName}">
+ <field name="geoName" title="${uiLabelMap.CommonGeoName}" tooltip="${uiLabelMap.ExampleLookupFields4}" tooltip-style="button-text">
<lookup target-form-name="LookupGeoName" description-field-name="geoId"/>
</field>
<!-- This field may be hidden and the name rendered in geoName using default-value if geoId is known when loading the form-->
<field name="geoId" title="${uiLabelMap.CommonGeoId}"><text/></field><!-- the text field is only used for rendering. In the "real life" you would use the hidden field commented below to pass the data to the request -->
- <!--field name="geoId"><hidden/></field-->
+ <!--field name="geoId"><hidden/></field-->
+
<sort-order>
<field-group>
<sort-field name="geoIdAlone"/>
</field-group>
<field-group>
+ <sort-field name="geoIdStd"/>
+ </field-group>
+ <field-group>
+ <sort-field name="geoIdReadOnly"/>
+ </field-group>
+ <field-group>
<sort-field name="geoName"/>
<sort-field name="geoId"/>
</field-group>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/FormWidgetExampleScreens.xml Thu Oct 25 05:04:09 2012
@@ -81,13 +81,12 @@ under the License.
</widgets>
</section>
</container>
- <container style="screenlet-body">
+ <container style="screenlet-body">
<container style="button-bar"><label style="h2">${uiLabelMap.ExampleLookupFieldsTitle}</label></container>
<container style="screenlet-body">
<label style="h3">${uiLabelMap.ExampleSourceCode}</label>
<label>${uiLabelMap.ExampleDefinitionName} "ExampleLookupFields" ${uiLabelMap.ExampleDefinitionFile}</label>
<link target="http://svn.apache.org/repos/asf/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
- <label>${uiLabelMap.ExampleLookupFields}</label>
<include-form name="ExampleLookupFields" location="component://example/widget/example/FormWidgetExampleForms.xml"/>
</container>
</container>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/googlebaseDivideList.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/googlebaseDivideList.groovy?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/googlebaseDivideList.groovy (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/googlebaseDivideList.groovy Thu Oct 25 05:04:09 2012
@@ -1,24 +1,39 @@
-import java.util.List;
-import javolution.util.FastList;
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *******************************************************************************/
-//productList.unique() like distinct sql command, return string type.
+// productList.unique() like distinct sql command, return string type.
def productUniqueStr = productList.unique();
def productUniqueStrList = productUniqueStr.toList();
def googleBaseList = delegator.findByAnd("GoodIdentification",["goodIdentificationTypeId":"GOOGLE_ID_" + productStore.defaultLocaleString], null, false);
-//find product is existed in google base.
+// find product is existed in google base.
def notNeededList = productUniqueStrList - googleBaseList.productId;
def resultList = productUniqueStrList - notNeededList;
-def list = [];
def productExportList = [];
-//if feed more than 1000 always found an IO error, so should divide to any sections.
+// if feed more than 1000 always found an IO error, so should divide to any sections.
def amountPerSection = 1000;
def section = (int)(resultList.size()/amountPerSection);
-if(resultList.size() % amountPerSection != 0){
+if (resultList.size() % amountPerSection != 0) {
section = section+1;
}
-for(int i=0; i<section; i++){
- if(!(i == (section-1))){
+for (int i=0; i<section; i++) {
+ if (!(i == (section-1))) {
productExportList.add(resultList.subList((i*amountPerSection), ((i+1)*amountPerSection)));
} else {
productExportList.add(resultList.subList((i*amountPerSection), resultList.size()));
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml Thu Oct 25 05:04:09 2012
@@ -38,6 +38,18 @@ under the License.
<param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
</context-param>
+ <!-- This parameter should be set to true for production. -->
+ <context-param>
+ <param-name>compressHTML</param-name>
+ <param-value>false</param-value>
+ <description>Remove unnecessary whitespace from HTML output.</description>
+ </context-param>
+ <!-- This parameter should be set to false for production. -->
+ <context-param>
+ <param-name>widgetVerbose</param-name>
+ <param-value>true</param-value>
+ <description>Enable widget boundary comments.</description>
+ </context-param>
<filter>
<filter-name>ContextFilter</filter-name>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl Thu Oct 25 05:04:09 2012
@@ -30,4 +30,5 @@ under the License.
</li>
</#list>
</ul>
+</div>
</#if>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl Thu Oct 25 05:04:09 2012
@@ -16,17 +16,30 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-
-
-<!DOCTYPE html>
-<html>
+<#assign docLangAttr = locale.toString()?replace("_", "-")>
+<#assign langDir = "ltr">
+<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
+ <#assign langDir = "rtl">
+</#if>
+<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${applicationTitle?if_exists}</title>
- <link rel="stylesheet" href="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.css" />
- <script src="/images/jquery/jquery-1.7.2.min.js" type="text/javascript"></script>
- <script src="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.js" type="text/javascript"></script>
- <meta name="viewport" content="width=device-width, initial-scale=1">
+ <#if layoutSettings.javaScripts?has_content>
+ <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+ <#list layoutSettings.javaScripts as javaScript>
+ <#if javaScriptsSet.contains(javaScript)>
+ <#assign nothing = javaScriptsSet.remove(javaScript)/>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ </#if>
+ </#list>
+ </#if>
+ <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
+ <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ </#list>
+ </#if>
</head>
<body>
<div data-role="header">
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/login.ftl?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/login.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/login.ftl Thu Oct 25 05:04:09 2012
@@ -18,21 +18,35 @@ under the License.
-->
<#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")>
<#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))>
+<#if username != "">
+ <#assign focusName = false>
+<#else>
+ <#assign focusName = true>
+</#if>
<form method="post" action="<@o...@ofbizUrl>" name="loginform" data-ajax="false">
<div data-role="fieldcontainer">
- <label for="USERNAME">Username</label>
+ <label for="USERNAME">${uiLabelMap.CommonUsername}</label>
<input type="text" id="USERNAME" name="USERNAME" value="${username}" size="20"/>
</div>
<div data-role="fieldcontainer">
- <label for="PASSWORD">Password</label>
+ <label for="PASSWORD">${uiLabelMap.CommonPassword}</label>
<input type="password" id="PASSWORD" name="PASSWORD" value="" size="20" />
</div>
<#if ("Y" == useMultitenant)>
<div data-role="fieldcontainer">
- <label for="tenantId">TenantId</label>
+ <label for="tenantId">${uiLabelMap.CommonTenantId}</label>
<input type="text" id="tenantId" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/>
</div>
</#if>
- <input type="submit" value="Login" class="loginButton" />
+ <input type="submit" value="${uiLabelMap.CommonLogin}" class="loginButton" />
</form>
+
+<script language="JavaScript" type="text/javascript">
+ document.loginform.JavaScriptEnabled.value = "Y";
+ <#if focusName>
+ document.loginform.USERNAME.focus();
+ <#else>
+ document.loginform.PASSWORD.focus();
+ </#if>
+</script>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml Thu Oct 25 05:04:09 2012
@@ -20,13 +20,32 @@ under the License.
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
<screen name="GlobalDecorator">
<section>
- <widgets>
- <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/includes/header.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/includes/messages.ftl"/></html></platform-specific>
- <decorator-section-include name="body"/>
- <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/includes/footer.ftl"/></html></platform-specific>
+ <actions>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true" />
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true" />
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true" />
+ </actions>
+ <widgets>
+ <include-screen name="GlobalActions" location="component://common/widget/CommonScreens.xml" />
+ <platform-specific>
+ <html>
+ <html-template location="component://hhfacility/webapp/hhfacility/includes/header.ftl" />
+ </html>
+ </platform-specific>
+ <platform-specific>
+ <html>
+ <html-template location="component://hhfacility/webapp/hhfacility/includes/messages.ftl" />
+ </html>
+ </platform-specific>
+ <decorator-section-include name="body" />
+ <platform-specific>
+ <html>
+ <html-template location="component://hhfacility/webapp/hhfacility/includes/footer.ftl" />
+ </html>
+ </platform-specific>
</widgets>
</section>
</screen>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/template/HtmlHead.ftl?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/template/HtmlHead.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ofbizwebsite/template/HtmlHead.ftl Thu Oct 25 05:04:09 2012
@@ -28,7 +28,7 @@ under the License.
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
<title>${(uiLabelMap.OfbizTitle)!"OFBiz, The Apache Open For Business Project"}</title>
<link rel="shortcut icon" href="/ofbiz/images/favicon.ico">
- <script language="javascript" src="/images/jquery/jquery-1.7.2.min.js" type="text/javascript"></script>
+ <script language="javascript" src="/images/jquery/jquery-1.8.2.min.js" type="text/javascript"></script>
<script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
<script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
<script language="javascript" src="/ofbiz/script/search.js" type="text/javascript"></script>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/ProjectScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/ProjectScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/ProjectScreens.xml Thu Oct 25 05:04:09 2012
@@ -423,7 +423,7 @@ under the License.
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleProjectGanttChart}">
<platform-specific>
- <html><html-template location="component://projectmgr/webapp/projectmgr/project/gantChart.ftl"/></html>
+ <html><html-template location="component://projectmgr/webapp/projectmgr/project/ganttChart.ftl"/></html>
</platform-specific>
</screenlet>
</decorator-section>
@@ -1027,7 +1027,7 @@ under the License.
<container style="clear"/>
<screenlet title="${uiLabelMap.PageTitleProjectGanttChart}">
<platform-specific>
- <html><html-template location="component://projectmgr/webapp/projectmgr/project/gantChart.ftl"/></html>
+ <html><html-template location="component://projectmgr/webapp/projectmgr/project/ganttChart.ftl"/></html>
</platform-specific>
</screenlet>
</widgets>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Thu Oct 25 05:04:09 2012
@@ -124,7 +124,7 @@
</entity-condition>
</actions>
<row-actions>
- <set field="showPosition1" value="${bsh:String prev=(String)previousItem.get("workEffortId");return !(prev!=null&&prev.equals(workEffortId));}" type="Boolean"/>
+ <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("workEffortId");return !(prev!=null&&prev.equals(workEffortId));}" type="Boolean"/>
</row-actions>
<field name="workEffortId"><hidden/></field>
<field name="phaseName" position="1" use-when="showPosition1"><display description="${phaseName}[${phaseId}]"/></field>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/MyWorkTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/MyWorkTests.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/MyWorkTests.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/MyWorkTests.xml Thu Oct 25 05:04:09 2012
@@ -20,7 +20,7 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
- <simple-method method-name="testUpdateTimesheetEntryByWorkeffortNotComplete" short-description="Test update timesheet entry by workeffort" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testUpdateTimesheetEntryByWorkeffortNotComplete" short-description="Test update timesheet entry by workeffort" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="scrumteam1"/>
</entity-one>
@@ -33,7 +33,7 @@ under the License.
<call-service service-name="updateTimesheetEntryByWorkeffort" in-map-name="inMap"></call-service>
</simple-method>
- <simple-method method-name="testUpdateTimesheetEntryByWorkeffortComplete" short-description="Test update timesheet entry by workeffort" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testUpdateTimesheetEntryByWorkeffortComplete" short-description="Test update timesheet entry by workeffort" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="scrumteam1"/>
</entity-one>
@@ -45,7 +45,7 @@ under the License.
<set field="inMap.checkComplete" value="Y"/>
<call-service service-name="updateTimesheetEntryByWorkeffort" in-map-name="inMap"></call-service>
</simple-method>
- <simple-method method-name="testUpdateTask" short-description="Test update tasks" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testUpdateTask" short-description="Test update tasks" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
@@ -57,7 +57,7 @@ under the License.
<call-simple-method method-name="updateTask" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
</simple-method>
- <simple-method method-name="testRemoveTaskAssignToMe" short-description="Test remove task assign to me" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testRemoveTaskAssignToMe" short-description="Test remove task assign to me" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
@@ -73,7 +73,7 @@ under the License.
<call-service service-name="unassignPartyFromWorkEffort" in-map-name="parameters"></call-service>
</simple-method>
- <simple-method method-name="testAddNewTimesheet" short-description="Test add a new timesheet" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testAddNewTimesheet" short-description="Test add a new timesheet" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
@@ -83,7 +83,7 @@ under the License.
<call-service service-name="createTimesheetForThisWeek" in-map-name="inMap" >
</call-service>
</simple-method>
- <simple-method method-name="testSetTimeSheetStatusToComplete" short-description="Test set timesheet status to complete" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testSetTimeSheetStatusToComplete" short-description="Test set timesheet status to complete" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductTest.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductTest.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ProductTest.xml Thu Oct 25 05:04:09 2012
@@ -21,7 +21,7 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
- <simple-method method-name="testCreateProductByAdmin" short-description="" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testCreateProductByAdmin" short-description="" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
@@ -36,7 +36,7 @@ under the License.
<call-simple-method method-name="createProductAndRole" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
</simple-method>
- <simple-method method-name="testUpdateProductByAdmin" short-description="" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testUpdateProductByAdmin" short-description="" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
@@ -53,7 +53,7 @@ under the License.
</simple-method>
<!-- Billing -->
- <simple-method method-name="testAddProductTimeToNewInvoice" short-description="Test Add Product Time To New Invoice" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testAddProductTimeToNewInvoice" short-description="Test Add Product Time To New Invoice" login-required="false">
<entity-one entity-name="UserLogin" value-field="userLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/QATests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/QATests.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/QATests.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/QATests.xml Thu Oct 25 05:04:09 2012
@@ -20,7 +20,7 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
- <simple-method method-name="testCreateTestTask" short-description="" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testCreateTestTask" short-description="" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="testadmin"/>
</entity-one>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ScrumProjectTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ScrumProjectTests.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ScrumProjectTests.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/ScrumProjectTests.xml Thu Oct 25 05:04:09 2012
@@ -66,7 +66,7 @@ under the License.
<call-simple-method method-name="updateScrumProject" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
</simple-method>
- <simple-method method-name="testCloseScrumProject" short-description="Test Close Scrum Project " login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testCloseScrumProject" short-description="Test Close Scrum Project " login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/SprintBacklogTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/SprintBacklogTests.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/SprintBacklogTests.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/SprintBacklogTests.xml Thu Oct 25 05:04:09 2012
@@ -20,7 +20,7 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
- <simple-method method-name="testcreateSprintBacklogByAdmin" short-description="" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testcreateSprintBacklogByAdmin" short-description="" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="admin"/>
</entity-one>
@@ -31,7 +31,7 @@ under the License.
<call-simple-method method-name="createSprintBacklog" xml-resource="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
</simple-method>
- <simple-method method-name="testcreateSprintBacklogByScrummaster" short-description="" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testcreateSprintBacklogByScrummaster" short-description="" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="scrummaster"/>
</entity-one>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/TaskTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/TaskTests.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/TaskTests.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/TaskTests.xml Thu Oct 25 05:04:09 2012
@@ -21,7 +21,7 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
- <simple-method method-name="testViewScrumRevision" short-description="Test View Scrum Revision" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testViewScrumRevision" short-description="Test View Scrum Revision" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
@@ -40,7 +40,7 @@ under the License.
</assert>
<check-errors/>
</simple-method>
- <simple-method method-name="testRetrieveMissingScrumRevision" short-description="Test Retrieve Missing Scrum Revision" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testRetrieveMissingScrumRevision" short-description="Test Retrieve Missing Scrum Revision" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
@@ -58,7 +58,7 @@ under the License.
</assert>
<check-errors/>
</simple-method>
- <simple-method method-name="testRemoveDuplicateScrumRevision" short-description="Test Remove Duplicate Scrum Revision" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testRemoveDuplicateScrumRevision" short-description="Test Remove Duplicate Scrum Revision" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/TimesheetTests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/TimesheetTests.xml?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/TimesheetTests.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/script/org/ofbiz/scrum/test/TimesheetTests.xml Thu Oct 25 05:04:09 2012
@@ -21,7 +21,7 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
- <simple-method method-name="testTimesheetToComplete" short-description="Test set timesheet status to complete" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testTimesheetToComplete" short-description="Test set timesheet status to complete" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
@@ -30,7 +30,7 @@ under the License.
<set field="inMap.statusId" value="TIMESHEET_COMPLETED"/>
<call-service service-name="updateTimesheet" in-map-name="inMap"></call-service>
</simple-method>
- <simple-method method-name="testTimesheetToInProcess" short-description="Test set timesheet status to In Process" login-required="false" user-login-name="userLogin">
+ <simple-method method-name="testTimesheetToInProcess" short-description="Test set timesheet status to In Process" login-required="false">
<entity-one value-field="userLogin" entity-name="UserLogin">
<field-map field-name="userLoginId" value="scrumteam2"/>
</entity-one>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java?rev=1401975&r1=1401974&r2=1401975&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java Thu Oct 25 05:04:09 2012
@@ -121,8 +121,8 @@ public class ScrumServices {
* <p>
* Use for view Scrum Revision
*
- * @param revision Revision number
- * @param repository Repository url
+ * @param ctx The DispatchContext that this service is operating in
+ * @param context Map containing the input parameters
* @return Map with the result of the service, the output parameters.
*/
public static Map<String, Object> viewScrumRevision(DispatchContext ctx, Map<String, ? extends Object> context) {
@@ -166,8 +166,8 @@ public class ScrumServices {
* <p>
* Use for retrieve the missing data of the Revision
*
- * @param latestRevision The latest revision number
- * @param repositoryRoot The repository root url
+ * @param ctx The DispatchContext that this service is operating in
+ * @param context Map containing the input parameters
* @return Map with the result of the service, the output parameters.
*/
public static Map<String, Object> retrieveMissingScrumRevision(DispatchContext ctx, Map<String, ? extends Object> context) {
@@ -259,7 +259,8 @@ public class ScrumServices {
* <p>
* Use for remove duplicate scrum revision
*
- * @param repositoryRoot The repository root url
+ * @param ctx The DispatchContext that this service is operating in
+ * @param context Map containing the input parameters
* @return Map with the result of the service.
*/
public static Map<String, Object> removeDuplicateScrumRevision(DispatchContext ctx, Map<String, ? extends Object> context) {