Commit Graph
5165 Commits
Author SHA1 Message Date
Ashish Vijaywargiya 4f8585623a Fixing bug of reading node name. When we read first child element of the response of any third party integration for example ups etc, node name can't be read using "node.getLocalName()". So changing node.getLocalName() --> node.getNodeName().
Thanks Vivek for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995384 13f79535-47bb-0310-9956-ffa450edef68
2010-09-09 11:32:28 +00:00
David E. Jones b69664a9d6 Fixed two issues: renderDisplayField macro was missing the title attribute, implemented the multi-position single forms, for a maximum position of 2 anyway
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995313 13f79535-47bb-0310-9956-ffa450edef68
2010-09-09 04:35:26 +00:00
Adam Heath be51724bc6 Expose actions variable to other code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995207 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:48 +00:00
Adam Heath 5ee6d42aef Move duplicated code that has one screen widget calling another screen,
into a global helper method.  Eventually, this method will be altered to
be able to 'change' which screen is actually included, based on various
conditions at runtime.  This will be used to eventually support partial
ajax page updates.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995206 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:42 +00:00
Adam Heath b5b019e4fe DecoratorSection was already fetching its name attribute from the
element; so call getName() on it, instead of fetching the attribute
locally.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995205 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:36 +00:00
Adam Heath 87a61d524f Remember the node's systemId, startColumn, and startLine, and use them
in a default toString() implementation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995204 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:31 +00:00
Adam Heath 3b4793f968 Enable tracking of xml node positions when reading documents.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995203 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:24 +00:00
Adam Heath 32fd7f2533 Add systemId to xml node location tracking; this is based on the
docDescription passed in, which in normal cases is the URL.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995202 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:18 +00:00
Adam Heath 923bf9d8ff Fix several overly wide screens in specialpurpose/ecommerce:
1: product detail hard-coded the width of the image, even if the actual
image was smaller.
2: products with surveys(gift card purchase) were overly large, which
caused them to float below the left content.
3: the header on productcategory listings had background lines that
overflowed underneath the left and right columns.

The ecommerce app is now closer to something we'd actually show a real
customer, in its default configuration.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995198 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:02:58 +00:00
Jacques Le Roux f5012cfbf8 1st pass on Example component clean-up
I began to clean and make things consistent for lookups (in order to demonstrate the new Name/id mechanism) but then I realized that it should use Example entity and not Party. I will change that later and will remove all out-of-framework dependencies in the Example component 

* I have added an example of the new Name/id mechanism
* I removed deprecated snippets in ExampleForms (some were already commented out) and used rather LookupExampleFeature enhanced with autocomplete
* In FormWidgetExampleForms.xml I tried to clean things for the autocomplete in the 1st lookup, but I thing there is an issue when more than one name field is retrieved. It does not behave consistently, try for a Person and a PartyGroup for instance...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@993527 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 20:46:32 +00:00
Jacques Le Roux dec4ab2572 Introduces a very simple mean 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). 
At least it easy to set and it works well for simples case for now (eg PartyGroup)

I did not find another way since Ajax.Autocompleter can't update another field. 
The alternative would be navigation to the next hidden field, at least it would avoid the mandatory Id/Name pair. 
But it's more difficult to demonstrate in Example component


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@993508 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 19:55:49 +00:00
David E. Jones d5ef229814 For response -> redirect-parameter element added value attribute so you can specify a static value to include in the redirected URL
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@993489 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 19:27:07 +00:00
Erwan de Ferrieres cd6c9502c2 OFBIZ-3912 -- Impossible to check DB by webtools https://issues.apache.org/jira/browse/OFBIZ-3912 -- A patch from Nicolas Malin\n DatabaseUtil needs a GenericHelperInfo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@993407 13f79535-47bb-0310-9956-ffa450edef68
2010-09-07 16:02:38 +00:00
Bruno Busco cca950be37 Converted WebTools->Logs->Service logs screen from FTL to form widget
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992791 13f79535-47bb-0310-9956-ffa450edef68
2010-09-05 14:19:11 +00:00
Bruno Busco 05113af8b5 Converted WebTools->Entity performance test screens from FTL to form widgets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992785 13f79535-47bb-0310-9956-ffa450edef68
2010-09-05 13:54:46 +00:00
Bruno Busco 4a5126fd9c Added some content to the WebTools main help page.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992720 13f79535-47bb-0310-9956-ffa450edef68
2010-09-05 07:59:03 +00:00
Bruno Busco 610b0291bc Added column sorting feature to WebTools cache forms.
It should be further improved since at the moment numbers are sorted as strings (10 is sorted before 2).
This is a new pattern that can be used to sort columns in forms where data come from Maps not directly retrieved from Entities.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992682 13f79535-47bb-0310-9956-ffa450edef68
2010-09-04 21:19:56 +00:00
Bruno Busco de3b9362a8 Changed indentation from 2 to 4 spaces.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992615 13f79535-47bb-0310-9956-ffa450edef68
2010-09-04 14:48:12 +00:00
Bruno Busco 1eecb10890 Converted WebTools->Cache screens from FTL to form widgets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992613 13f79535-47bb-0310-9956-ffa450edef68
2010-09-04 14:37:32 +00:00
Bruno Busco 9b22452922 Converted WebTools->Statistics screens from FTL to form widgets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992491 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 21:58:57 +00:00
Bruno Busco 156d8b1a74 Converted part of thread list screen from FTL to form widgets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992447 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 20:05:55 +00:00
Bruno Busco 9f557eae9e Added the "default-value" attribute to the "display" tag.
This allows to specify a string to be shown in a display field when it is empty.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992441 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 19:55:08 +00:00
Bruno Busco fbbe6a7c31 Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992400 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 18:14:28 +00:00
Erwan de Ferrieres e7faeca8f3 Missing entity uiLabels on CUSTREQ_STTS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992321 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 15:05:29 +00:00
Erwan de Ferrieres ab43dfbf0e Showing the title when a portal page is displayed on screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991947 13f79535-47bb-0310-9956-ffa450edef68
2010-09-02 14:27:17 +00:00
Jacques Le Roux 427d8fc258 A patch from Liu Xiangqian "method writeObject(StringBuilder sb, Object value, boolean allowJsonResolve) in UtilIO always throw an IOException" (https://issues.apache.org/jira/browse/OFBIZ-3916) - OFBIZ-3916
Tried to invoke method UtilIO.writeObject() but found the following code

try {
StringWriter writer = new StringWriter();
if (encodeObject(writer, value, allowJsonResolve)) { sb.append(writer.toString()); return; }
} catch (Exception e) {
}
throw new IOException("Can't write (" + value + ")");

It caused the method to always throw an IOException.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991485 13f79535-47bb-0310-9956-ffa450edef68
2010-09-01 09:15:14 +00:00
David E. Jones 5c5149bf11 Small change to short ton description as it seems more people are familiar with the term US ton than short ton
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991279 13f79535-47bb-0310-9956-ffa450edef68
2010-08-31 18:14:39 +00:00
Erwan de Ferrieres 5b949ffeb3 OFBIZ-3911 - A patch from Nicolas Malin -- Correct ij.ofbiz script with derby 10.6.1.0
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991114 13f79535-47bb-0310-9956-ffa450edef68
2010-08-31 08:02:59 +00:00
Erwan de Ferrieres ed69193490 BIRT is starting at 1, so need to add 1 to the list size
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990829 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 15:50:07 +00:00
Ashish Vijaywargiya e90d83e6af Applied patch from jira issue OFBIZ-3909 - Bug in showing online estimate rate on UPS services.
UPS Online shipping rates are showing wrong values when product weight having different weightUomId. It doesn't support UOM Conversion as it is working in USPS services.
So fixing this bug, following work is done.

1) Calling generic methods "getPackageSplit", "getProductItemInfo" & "calcPackageWeight" methods from ShipmentWorker.java
2) Removed duplicate methods from UpsServices.java

Thanks Amit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990751 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 09:55:02 +00:00
Scott Gray f79f17b18a Completed the fix reported in r989475 (and subsequently reverted in r989722) by Erwan.
The condition-object element used to have an attribute named "field-name" which was later replaced with "field" but the code was instead checking for "field-name" and then "name".
Fixed so that the code checks for "field" and then "field-name".

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990347 13f79535-47bb-0310-9956-ffa450edef68
2010-08-28 11:35:24 +00:00
Scott Gray 2dcb051ff1 Minor groovy tidy up
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990343 13f79535-47bb-0310-9956-ffa450edef68
2010-08-28 11:21:33 +00:00
Jacques Le Roux 910296c01f A patch from Sascha Rodekamp "Xml Ds Dump Iterator Fix - Webtools" (https://issues.apache.org/jira/browse/OFBIZ-3906) - OFBIZ-3906
Issue with the Xml Export: it seems that there is an issue with the each() loop in Groovy, during the export OFBiz throws a lot of warnings which regards to an wrong used iterator. 
So i changed the each() loop into a normal iterator which solves the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990339 13f79535-47bb-0310-9956-ffa450edef68
2010-08-28 10:53:03 +00:00
Scott Gray 58e89dd716 Set the response content type to what was provided in the view-map definition instead of hard-coding application/pdf, allows for any type of document supported by fop to be rendered by the view handler.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990335 13f79535-47bb-0310-9956-ffa450edef68
2010-08-28 09:47:15 +00:00
Jacques Le Roux 0bcdc3e955 Better comment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990328 13f79535-47bb-0310-9956-ffa450edef68
2010-08-28 09:08:45 +00:00
Jacques Le Roux d41c42d069 Fix a bug in setDependentDropdownValuesJs.ftl (used in conjunction with getDependentDropdownValues.js)
I just realize that I missed to change from maindId to paramKey in the observe event. It works with country where the values are the same (countryGeoId), but in other cases it does not (notably in the issue reported at https://issues.apache.org/jira/browse/OFBIZ-3247

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989829 13f79535-47bb-0310-9956-ffa450edef68
2010-08-26 17:11:43 +00:00
Erwan de Ferrieres 6d59cc8f25 reverting 989475 as it is generating too much backward compatibility issues
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989772 13f79535-47bb-0310-9956-ffa450edef68
2010-08-26 15:41:49 +00:00
Erwan de Ferrieres fc024e7080 OFBIZ-3901 - Birt charts and PDF generation -- now Birt PDF files containing charts are generated.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989593 13f79535-47bb-0310-9956-ffa450edef68
2010-08-26 10:27:19 +00:00
Erwan de Ferrieres d6564a8188 when using an entity-condition, the object's attribute name used in condition object parameter was not taken into account
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989475 13f79535-47bb-0310-9956-ffa450edef68
2010-08-26 07:07:12 +00:00
Bruno Busco 6cb038332c Removed settings of hideSearch field. This is not used any more.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989397 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 22:54:50 +00:00
Jacques Le Roux 9fd01fcd31 Removes a framework dependency on Marketing component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989389 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 22:20:18 +00:00
Erwan de Ferrieres 24c97a5b0c Changing functioning for display-size, now displaying dots inside the text instead at the end, so it is more readable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989313 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 19:25:56 +00:00
Jacques Le Roux dc96c0990c Fix a bug when there are no comments at all.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989166 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 15:19:05 +00:00
Erwan de Ferrieres 0c34a47300 no functionnal changes, just reorganizing data order
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989041 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 12:06:37 +00:00
Erwan de Ferrieres 99eace2c07 Examples on creating charts with Birt -- HTML generation is OK, still some work to do on PDF
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988846 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 07:53:56 +00:00
Jacques Le Roux 792aa82bee A solution for "State field is missing - Not in List or N/A" reported by Sam Hamilton at https://issues.apache.org/jira/browse/OFBIZ-3247 - OFBIZ-3247
I finally decided to use the new Dependent Dropdowns mechanim.
I have also refined how it's used in Example to avoid confusion, so changed setDependentDropdownValuesJs.ftl to pass paramKey when it's different from mainId

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988508 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 12:32:52 +00:00
Bruno Busco b7ea12ceba Enabled column sorting feature to temporal expression screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988443 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 09:03:37 +00:00
Bruno Busco 4300a7aae9 Fixed TabBar menus highlights in WebTools configuration screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988434 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 08:47:40 +00:00
Erwan de Ferrieres 25e75576bd OFBIZ-3896 BIRT charts are not rendered - this file wasn't updated when moving from birt 2.5.1 to 2.6.0
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988024 13f79535-47bb-0310-9956-ffa450edef68
2010-08-23 08:14:53 +00:00
Erwan de Ferrieres 2b854ca29b groovy 1.7.4 bugfix release (notes : http://jira.codehaus.org/secure/ReleaseNote.jspa?projectId=10242&version=16563)\n this time it's ok
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987905 13f79535-47bb-0310-9956-ffa450edef68
2010-08-22 13:57:31 +00:00