Scott Gray
aa499be644
Span elements weren't being created for the ajax in place editor, fixes OFBIZ-2494 reported by Jacques Le Roux
...
Also removed inPlaceEditorId from the code since it is always equal to idName anyway
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835585 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 22:06:34 +00:00
Scott Gray
c3d2b880de
Delay the completion of the testServiceEcaGlobalEventExec test to allow the global ecas to complete before the next test is run, fixes OFBIZ-3124 reported by Jeremy Wickersheimer
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835548 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 21:13:49 +00:00
Scott Gray
c0cfbd2469
Allow the duration of the blocking service test to be specified by the caller
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835546 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 21:11:04 +00:00
Scott Gray
f69cbf5456
Don't attempt to cast Service Eca Set Field values to string after formatting, fixes ClassCastException caused by when using certain formats
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835541 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 20:57:36 +00:00
Adam Heath
64b4ccc5f7
Oops, didn't do a clean/ant run, and broke this when
...
AbstractCollectionConverter was removed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835476 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:56:39 +00:00
Adam Heath
eb02b4e77d
Simplied the object graph, removed AbstractCollectionConverter. All
...
collection conversions now have proper generification.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835453 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:15:01 +00:00
Adam Heath
edf7210d88
Remove extraneous blank lines, and trailing whitespace.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835451 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 17:12:02 +00:00
Adrian Crum
be36dd70be
Changed the String to Timestamp converter code to fix a problem reported by Hans.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835440 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 16:52:23 +00:00
Jacques Le Roux
7786dd9bfb
commons-dbcp-1.3-20091111-r834702.jar built directly from DBCP trunk. An initiative from Philippe Mouawad at "Memory leak due to transaction management" ( https://issues.apache.org/jira/browse/OFBIZ-2599 ) - OFBIZ-2599
...
We are been using Ofbiz with DBCP based implementation.
Ofbiz uses a Head revision of DBCP (package org.apache.commons.dbcp.managed is the same as current TRUNK) and geronimo-transaction-1.0.
We are having recurrent OutOfMemory which occur on a 2 days basis.
See: https://issues.apache.org/jira/browse/DBCP-294
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835394 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 14:39:43 +00:00
Ashish Vijaywargiya
1fff46444e
Applied patch from jira issue - OFBIZ-2999 - Fix layout of profile pages.
...
Layout of profile pages (new pages) is not displayed properly.
Thanks Deepak for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835375 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 13:13:34 +00:00
Scott Gray
6fa4e52764
Passed in locale was being discarded, fixes OFBIZ-3177 reported by Willem Janssen
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835309 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 09:15:42 +00:00
Jacques Le Roux
0bd14b407c
A patch from Bob Morley "When an entityModel has a field marked as a primary key, it should also be set to NotNull" ( https://issues.apache.org/jira/browse/OFBIZ-3154 ) - OFBIZ-3154
...
We were doing some work with the ModelField and noticed that when a field is marked as a primary key it can still have its "NotNull" property set to "false" (the default). Because we were doing work based on if a field was nullable it was causing a bug on primary keys. The suggestion is to set NotNull = "true" when a field is marked as a primary key. This should have no impact to current code as (in most places) a redundant check was being done (see creation of tables where it will add "NOT NULL" based on both isNotNull and isPk – ideally it should be just based on the former).
This change makes minor modifications to two files ModelField and ModelEntity. ModelField.setIsPk() will call setIsNotNull(true) when the primary key indicator is true. ModelEntity will call field.isNotNull = true when it is reading the primary key elements in the entity definition.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835303 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 08:49:27 +00:00
Hans Bakker
398139f70d
add a portal page as the first page in sfa containing calendar and email, but can be changed as required via preferences. add the first screens for events which will appear on the calendar. next step will be to be able to connect events/tasks to opportunities, show them in the party pprofile etc...
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835270 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 07:04:41 +00:00
Adrian Crum
19f8bf0228
More converter improvements. Better handling of strings supplied to formatting classes.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835197 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 02:31:59 +00:00
Adam Heath
172a135a56
Move getSourceClass and getTargetClass into the base class; removes a
...
bunch of code. This also nescessitated the creation of a helper class
for collection containment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835164 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 23:47:03 +00:00
Jacques Le Roux
a3b3d8623f
A simple fix to avoid NPE in grovvy scripts, from Jeremy Wickersheimer at "Possible NPE in security check" ( https://issues.apache.org/jira/browse/OFBIZ-3160 ) - OFBIZ-3160
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835161 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 23:38:05 +00:00
Adrian Crum
3fe7e1f03e
Oops, I forgot to include one of the Converter collections in my last commit.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835159 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 23:29:21 +00:00
Bilgin Ismet Ibryam
108bcc056e
Fixed rendering of image elements inside link elements.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835081 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 21:38:16 +00:00
Adam Heath
86872afc45
Handle runtime/tempfiles not existing; it's an empty folder, so some
...
revision control systems don't handle that case, and never create it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835074 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 21:20:02 +00:00
Adrian Crum
a55f49fce5
More improvements to the conversion framework, plus bug fixes.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835032 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 19:35:34 +00:00
Adrian Crum
ae236a6b7d
Conversion framework improvements, fixed bugs reported on mailing list.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834978 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 17:45:33 +00:00
Hans Bakker
bf3790cc50
ordered and itemized list now possible in the help screens and works in all three themes, see for an example in the example help screens: OFBIZ-3170 provided patch partly implemented
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834823 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 09:50:01 +00:00
Anil Patel
ca9ba906dd
use has_content to check if text parameter has any value
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834748 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 03:13:35 +00:00
Adrian Crum
7ec17ed148
Some work on CachedClassLoader.java. Fixed non-thread-safe code, converted HashMap and HashSet to Javolution classes, added a registerClass method, and simplified the Init interface.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834727 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 00:39:44 +00:00
Adrian Crum
2f53c75789
Revert unintended change.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834667 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 21:08:31 +00:00
Adrian Crum
b4d02def78
Modified ObjectType.java to use only the new conversion framework.
...
This change can be reverted if any major issues come up. I will monitor the dev mailing list and fix any issues that are reported.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834552 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 17:18:34 +00:00
Adrian Crum
3fcdc998af
Minor improvements to the new object type Converters.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 17:14:58 +00:00
Jacques Le Roux
4ec0dddba6
A partial patch from Amit Sharma "Improvement in input validation of 1st step (shopping cart) on onePageCheckout page." ( https://issues.apache.org/jira/browse/OFBIZ-3098 ) - OFBIZ-3098
...
A common label, complete r834493
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834527 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 16:20:53 +00:00
Jacques Le Roux
107acdde60
I prefer to revert as it's not needed anymore since r834444. I had an intuitive feeling that something was wrong, and forgot to check :( Thanks to Todor it's ok!
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834447 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 12:16:43 +00:00
Jacques Le Roux
c8372e6329
Fix bugs I introduced at r833725 converting while loops to enhanced for loops, thanks to Todor Spasov on dev ML.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834444 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 12:01:37 +00:00
Anil Patel
52e7a3ad66
Removed extra container around labels. Apply h1 (or h2, h3) style to label instead.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834376 13f79535-47bb-0310-9956-ffa450edef68
2009-11-10 07:38:24 +00:00
Jacques Le Roux
831a999513
Better French label
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834138 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 16:41:11 +00:00
Adrian Crum
ee835d014a
Added Java type converters for the entity engine.
...
This commit demonstrates how the object type converter framework can be extended by other components.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833964 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 01:48:23 +00:00
Jacques Le Roux
dc05c50d69
A patch from Bruno Busco "The icon used for accessing the lookups should be defined by the theme" ( https://issues.apache.org/jira/browse/OFBIZ-3176 ) - OFBIZ-3176
...
In this patch the lookup field renderer has the link image not as a static img field but specified by the theme through a style class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833937 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 22:35:51 +00:00
Jacopo Cappellato
7b8ab6c265
Fixed bug that was preventing the recursive algorithm to work properly.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833916 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 19:31:49 +00:00
Jacques Le Roux
c1ccfd9975
A patch from Bruno Busco "Collapsible Field Groups with clickable title" ( https://issues.apache.org/jira/browse/OFBIZ-3176 ) - OFBIZ-3176
...
in the attached patch there is a new rendering for the Group Field Title bar.
I removed the table and used simple divs.
Moreover the field group title is now all clickable in order to collapse expand the group.
The necessary changes to all themes are also included in the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833910 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 18:36:30 +00:00
Bruno Busco
765c98327a
Added an example of non collapsible groupfield in the Widget Example Form
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833884 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 15:23:52 +00:00
Adrian Crum
5babe48c44
File missing in last commit.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833828 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 05:12:20 +00:00
Adrian Crum
6d4917f304
Added Collection Converters.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833827 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 05:08:26 +00:00
Adrian Crum
2070f32b2e
Modified ObjectType.java to use the new Java object type conversion framework.
...
Since the new converters aren't finished, I set it up so conversions fall back on the old ObjectType.java conversion code when needed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833786 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:48:19 +00:00
Adrian Crum
99d3b54cb8
The new Java object type conversion framework. It isn't complete, but there is enough there to grasp the general idea.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833784 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:43:17 +00:00
Adrian Crum
fba568b7bc
Fixed incorrect framework/base test class binary name.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833781 13f79535-47bb-0310-9956-ffa450edef68
2009-11-08 00:01:06 +00:00
Jacques Le Roux
a77eddd077
A (slightly modified) patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - widget" ( https://issues.apache.org/jira/browse/OFBIZ-3123 ) - OFBIZ-3123
...
I have only replaced a while loop by an enhanced for loop
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833770 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 21:35:50 +00:00
Jacques Le Roux
f01a7c8505
A (slightly modified) patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - webtools" ( https://issues.apache.org/jira/browse/OFBIZ-3122 ) - OFBIZ-3122
...
I have replaced some while loops by enhanced for loops
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833731 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 18:49:09 +00:00
Jacques Le Roux
cbc51c2532
A patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - webslinger" ( https://issues.apache.org/jira/browse/OFBIZ-3121 ) - OFBIZ-3121
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833727 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 18:18:33 +00:00
Jacques Le Roux
ac889d7a13
A modified patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - entityext" ( https://issues.apache.org/jira/browse/OFBIZ-3108 ) - OFBIZ-3108
...
I replaced 4 while loops by for loops. Doing that I removed the empty checks. So I also used a FastList in StrungUtile.split() which I also refactored a bit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833725 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 18:14:22 +00:00
Jacques Le Roux
437de8786a
A (slightly modified) patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - entityext" ( https://issues.apache.org/jira/browse/OFBIZ-3108 ) - OFBIZ-3108
...
I replaced 3 while loops by for loops
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833715 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 17:10:43 +00:00
Jacques Le Roux
415aa0e064
A (slightly modified) patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - appserver" ( https://issues.apache.org/jira/browse/OFBIZ-3101 ) - OFBIZ-3101
...
I just prefered to replace the @SuppressWarnings("unchecked") for GenerateContainer.getClasspath() by <?> (generics are not covariant), but it's actually a matter of taste.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833698 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 15:18:20 +00:00
Bruno Busco
e501b450c6
Changed nav-pager using the styles as defined in the widget renderNextPrev macro.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833652 13f79535-47bb-0310-9956-ffa450edef68
2009-11-07 08:32:28 +00:00
Jacques Le Roux
e4df776a22
A patch from Bruno Busco "Adding pagination icons to Bluelight theme" ( https://issues.apache.org/jira/browse/OFBIZ-3168 ) - OFBIZ-3168
...
A change that allows a theme to replace the "Prev" "Next" labels with icons. Now only on Blue Light theme/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@833378 13f79535-47bb-0310-9956-ffa450edef68
2009-11-06 12:43:22 +00:00