Bilgin Ismet Ibryam
ffe7c0926a
Fix for the issue reported in https://issues.apache.org/jira/browse/OFBIZ-3196
...
Set also the result from services invoked by multi-service w/o a suffix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836192 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 15:42:26 +00:00
Jacques Le Roux
ffdbca925e
A patch from Marc Morin "Resolve java warnings exposed in Eclipse : framework - webapp" ( https://issues.apache.org/jira/browse/OFBIZ-3116 ) - OFBIZ-3116
...
With few changes notably an enhanced for loop instead of while iterator and
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836141 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 08:29:42 +00:00
Adam Heath
14c9b6f7f4
Support complex aliases now. Note, that string default values do not
...
work corretly, and ModelViewEntity does not do any encoding of the
value, and this parser doesn't handle that.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836088 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 01:15:56 +00:00
Adam Heath
6003fb0cf5
Helper method to add several complex alias members.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836086 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 01:14:49 +00:00
Adam Heath
8be78c2804
Add aggregate function support for field definitions.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836073 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 00:13:09 +00:00
Scott Gray
64c38ffcc3
Removed anonymous password from the example assert data test since it was removed from the seed data in r829464, the test now passes again
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836051 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 23:04:34 +00:00
Jacques Le Roux
5fc931c191
A patch from Bruno Busco "A new droppingcrumbs theme" ( https://issues.apache.org/jira/browse/OFBIZ-3156 ) - OFBIZ-3156
...
An updated patch to be used to show correctly the tabbars with this theme.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836044 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 22:47:44 +00:00
Bruno Busco
5899644275
Better Italian labels
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836021 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 22:15:03 +00:00
Jacques Le Roux
2e4130844b
commons-dbcp-1.3-20091113-r835956 .jar replaces commons-dbcp-1.3-20080708-r674758.jar
...
Built directly from DBCP trunk. Compiles with jdk 1.5 and 1.6 as well, runs also with both
An initiative from Philippe Mouawad at "Memory leak due to transaction management" (https://issues.apache.org/jira/browse/OFBIZ-2599 ) - OFBIZ-2599
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836015 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 22:00:12 +00:00
Adam Heath
d17a8bf5c6
Make AND have a higher priority than OR.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835938 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 17:44:44 +00:00
Adam Heath
8bafb94b7e
Implement list values, and handle between(needed to be special cased).
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835934 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 17:28:35 +00:00
Adam Heath
cc340041ce
Implement relations in xml output.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835933 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 17:27:29 +00:00
Jacopo Cappellato
40dc7cd9ab
Replaced hardcoded value for view size in pagination macro with the viewSize variable.
...
Thanks to Divesh Dutta for the patch, OFBIZ-3194
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835925 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 17:12:52 +00:00
Ashish Vijaywargiya
76c426670d
Applied patch from jira issue OFBIZ-2984 - HTML cleanup for Product Detail page.
...
In this patch table are removed for non tabular data and used div, and add CSS code for layout issue that created due to this cleanup.
Thanks Rohit for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835861 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 14:38:35 +00:00
Jacques Le Roux
03ac565c90
No functional changes just a clean-up : no intermediate var is needed
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835851 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 14:01:47 +00:00
Jacques Le Roux
6e89a069e7
Revert r835394 (DBCP upgrade, issue compiling with jdk 1.5 OOTB)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835801 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 10:28:29 +00:00
Adam Heath
b33013c644
Add shorthand for keymap lists, making use of "USING".
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835792 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:47:58 +00:00
Adam Heath
c1a71d6eb0
Example of relations.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835790 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:35:52 +00:00
Adam Heath
60c9b07217
Send the debug to the browser, instead of the console.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835789 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:35:33 +00:00
Adam Heath
4a141e10fe
Add <TYPE> to NamePart(); the other words should also be added here.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835787 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:21:41 +00:00
Adam Heath
38d0d601ba
Add relation support. Not fully correct, as one-nofk is not yet
...
supported, because of the '-' in the name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835786 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:20:15 +00:00
Adam Heath
a4a9095e69
Fix creation when title=null.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835785 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 09:18:17 +00:00
Adam Heath
d5c53231e9
Inline AllField and FieldDef, which lets LOOKAHEAD be removed.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835768 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:47:04 +00:00
Adam Heath
d8d6b957e4
More example usage, shows condition parsing, and makes use of more
...
sql syntax.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835765 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:24:41 +00:00
Adam Heath
8c84c6c554
Methods to convert dynamic views back to xml.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835764 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:20:15 +00:00
Adam Heath
eace82a28c
Fix KeyMaps(), duplicate keymap in the returned list.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835762 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 07:15:20 +00:00
Adam Heath
4cfae426e4
Create a method to parse stand-alone conditions.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835748 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 05:39:11 +00:00
Adam Heath
dc56406606
Support sub conditions with ().
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835747 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 05:38:18 +00:00
Adam Heath
c8f1e223c8
No longer use jjtree to implement parsing. As a consequence of this,
...
SQLSelect no longer depended on Parser, so javac wouldn't compile the
generated code. SQLUtil was added to deal with this(this class will
get more helpers later).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835741 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 04:55:55 +00:00
Adam Heath
65b2182293
Implement ORDER BY and GROUP BY; also, multiple joins work now.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835731 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 04:08:59 +00:00
Adam Heath
4e69fb0764
Allow for setting groupBy fields with just a simple list.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835729 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 03:59:34 +00:00
Adrian Crum
7a5509a277
Small improvement to the Converters class. A converter is registered only once.
...
Now client code can create local instances of specific converters without interfering with the operation of the factory method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835667 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 00:31:39 +00:00
Adam Heath
5f44e7e3de
Example showing how the sql parser works.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835650 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 00:04:44 +00:00
Adam Heath
205d63f9fc
<NAME> actually swallows all name parts, don't need to loop in NamePart.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835649 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 00:01:23 +00:00
Adam Heath
43948cfff3
Store the DynamicViewEntity into the SQLSelect node.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835648 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 23:59:11 +00:00
Adam Heath
b15bba608f
Start of new sql parsing code. Not completely tested. It *does* parse
...
a test SELECT; what is not tested is actually running the built
DynamicViewEntity.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835637 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 23:23:12 +00:00
Adam Heath
afee8ad000
Register the comparison operators with their punctuation variants.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@835636 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 23:21:29 +00:00
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