Jacques Le Roux
a81e990353
A patch from Deyan Tsvetanov "Service SaveLabelsToXmlFile omits labels for new locales that did not exist prior to calling service" ( https://issues.apache.org/jira/browse/OFBIZ-3869 ) - OFBIZ-3869
...
1) Use LabelManagerFactory and try to add labels for a locale that does not exist in the resource bundles - for example en_US.
2) Invoke the service SaveLabelsToXmlFile
Expected behavior: the resource bundle should contain the newly added locales
Experienced behavior: the resource bundle does not contain the labels for the newly added locales.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@979204 13f79535-47bb-0310-9956-ffa450edef68
2010-07-26 09:01:56 +00:00
Jacques Le Roux
1c0d7111b1
Makes fadeBackground="true" as it's by default in xsd and allow to pass disabled(true or false)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@979104 13f79535-47bb-0310-9956-ffa450edef68
2010-07-25 19:57:16 +00:00
Scott Gray
f4b8fe52fc
Converted all render* methods to use executeMacro(Writer, String, Map) instead of executeMacro(Writer, String). Removes over 100 lines of StringWriter usage, makes the code easier to read and also fixes the bug that Jacques committed a workaround for in r978893
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@978954 13f79535-47bb-0310-9956-ffa450edef68
2010-07-25 00:36:13 +00:00
Scott Gray
a704a811ee
Changed the parameter map from <String, String> to <String, Object> since some macros use booleans and integers instead of strings. Changed the method to only wrap strings in double quotes.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@978953 13f79535-47bb-0310-9956-ffa450edef68
2010-07-25 00:36:02 +00:00
Scott Gray
a26146535f
Add a new method for constructing a freemarker macro call string, should simplify the code needed to generate a macro call and centralize the double quote encoding of parameter values. I'll be working to switch all of the render* methods over to using this today.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@978944 13f79535-47bb-0310-9956-ffa450edef68
2010-07-24 23:15:45 +00:00
Jacques Le Roux
bfc14b25c9
Revert r966203 as asked by Adam on dev ML (I was also not for this change so 2x -1)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@978863 13f79535-47bb-0310-9956-ffa450edef68
2010-07-24 12:42:40 +00:00
Jacques Le Roux
725f40b9d0
A patch from Sascha Rodekamp "Method to get a child element attribute from a specific XML file" ( https://issues.apache.org/jira/browse/OFBIZ-3874 ) - OFBIZ-3874
...
Just a good method to return a named attribute of a named child node or a default if null.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@967151 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 16:06:41 +00:00
Erwan de Ferrieres
c39c604127
Manage compositeTypes in multi handler
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@967012 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 09:27:59 +00:00
Adam Heath
827c205352
Fix file leak problem in KeyStore, the stream must be closed by the
...
caller(which also generally means doing it in a finally clause).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966785 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 18:30:51 +00:00
Joseph Eckard
d265053740
base font url will always be null
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966719 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 16:01:22 +00:00
Joseph Eckard
ea05e29713
replacing calls to deprecated FopFactory methods getFontBaseURL / setFontBaseURL
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966718 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 16:01:14 +00:00
Joseph Eckard
18f557fe42
reverting previous change, BaseURL is not the same as FontBaseURL
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966717 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 16:01:06 +00:00
Erwan de Ferrieres
124f19b1b4
Finally adding Apache FOP 1.0, barcode generation is now working
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966662 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 14:02:39 +00:00
Erwan de Ferrieres
9a78318c28
Reverting FOP1.0 integration as it is breaking the barcode generation. Still some work to be done
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966392 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 19:56:00 +00:00
Erwan de Ferrieres
d5020c9d5e
Adding the new FOP 1.0 to OFBiz
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966285 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 15:44:16 +00:00
Erwan de Ferrieres
7589e40be7
Correction for r966123, parametersMapAcsr could be null
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966282 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 15:38:33 +00:00
Erwan de Ferrieres
606cf7fc0f
if a time-dropdown has no value then 00:00 is displayed instead of the current time
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966203 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 12:14:08 +00:00
Erwan de Ferrieres
4800e33723
Adding event and action attributes to date-time field
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966202 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 12:10:08 +00:00
David E. Jones
9900ae2f76
Fixed NPE, improved handling
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966130 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 08:01:14 +00:00
David E. Jones
5835ddaa77
Added support for parameters-map for menu widget link elements
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@966123 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 07:30:37 +00:00
Adam Heath
b198a80d4e
Fix typo s/espacing/escaping/
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965919 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:32 +00:00
Adam Heath
ac2299c50e
Fix a bunch of no final newline issues.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Adam Heath
92d004a866
Fix open file leak; the InputSource is only processed when a freemarker
...
template is given, so only attempt to create one if a template has been
specified.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965916 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:14:17 +00:00
Adam Heath
695cc497f2
Fix coverage reports; the coverage for base was reporting 100%, which is
...
not correct. With real numbers on base, it shows a lot of missing
lines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965914 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:14:06 +00:00
Adrian Crum
9c11c2c261
Added Boolean converter tests - copied from Apache Commons Convert.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965843 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 13:39:05 +00:00
Adrian Crum
b8ad20ea06
Import cleanups and compiler warning fixes - no functional change.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965841 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 13:36:13 +00:00
Scott Gray
4e0a332c82
Correct some jar names that cause a warning on startup.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965689 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 00:23:04 +00:00
Scott Gray
114c8ae6a3
Setting the request-map/security element's direct-request attribute to false was only working if a default-request was present. Reported by Wai in OFBIZ-3861 and fixed using a variation of the patch that he supplied.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965163 13f79535-47bb-0310-9956-ffa450edef68
2010-07-18 05:55:35 +00:00
David E. Jones
339da2c8f1
Added support for passing extra server-side parameters in a Map from the screen definition, ie screen actions
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965154 13f79535-47bb-0310-9956-ffa450edef68
2010-07-18 02:24:21 +00:00
David E. Jones
d20742c504
Changed Visit.clientIpAddress from id (20 chars) to short-varchar (60 chars) to handle IPv6 addresses
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@964553 13f79535-47bb-0310-9956-ffa450edef68
2010-07-15 19:46:40 +00:00
Hans Bakker
0a21d46376
correction on previous commit, this one and previous contributed by chattree
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@964431 13f79535-47bb-0310-9956-ffa450edef68
2010-07-15 13:57:36 +00:00
Hans Bakker
63ef224344
upgrade birt to 2.6 and at the same time upgrade the itext library (OFBIZ-3407) which does work with this birt version
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@964371 13f79535-47bb-0310-9956-ffa450edef68
2010-07-15 10:33:57 +00:00
David E. Jones
127bc8cba1
Small change so that formatted intervals don't have superfluous commas
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@963630 13f79535-47bb-0310-9956-ffa450edef68
2010-07-13 09:34:29 +00:00
Erwan de Ferrieres
903b726770
As spotted by Matthieu Bollot on dev mailing-list, Su and Sa days were inverted
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@963271 13f79535-47bb-0310-9956-ffa450edef68
2010-07-12 12:52:28 +00:00
David E. Jones
c0a8945cb8
Small change to MacroFormRenderer to use a marco for doing the form close for multi forms, necessary for those to work when rendered using the fo macro library
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@963018 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 08:55:18 +00:00
David E. Jones
82a12b58e2
Fix for reversed logic in macro form renderer for the ajaxEnabled flag
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@962997 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 06:36:06 +00:00
David E. Jones
347b42a174
When a screen fop render fails, puts the screen XSL:FO output text in the log so you can see what caused the problem
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@962996 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 06:35:09 +00:00
David E. Jones
e87f05bf16
Import cleanups only
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@962995 13f79535-47bb-0310-9956-ffa450edef68
2010-07-11 06:34:20 +00:00
Hans Bakker
7801aaf359
add a explanation how the 'widgetVerbose' parameter can be used in web.xml and comment out the setting in the example component because widget comments should be shown out of the box there.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@962392 13f79535-47bb-0310-9956-ffa450edef68
2010-07-09 02:34:22 +00:00
Hans Bakker
84641a624f
make widgetBoundaryCommentsEnabled work as the descriptions states: Widget boundary comments are enabled by setting widgetVerbose true in the context Map, OR by setting widget.verbose=true in widget.properties. And not let the context override the widget.properties setting
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@961684 13f79535-47bb-0310-9956-ffa450edef68
2010-07-08 09:49:57 +00:00
Erwan de Ferrieres
c0f074773b
Wrong parameters size was used for args with presentation=layer
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@961324 13f79535-47bb-0310-9956-ffa450edef68
2010-07-07 09:55:28 +00:00
Adrian Crum
cc9e403254
Fixed a bug in JdbcValueHandler.java reported by Hans on the dev ml - PostgreSQL BYTEA SQL types threw an exception. This fix replaces the entityengine.xml datasource use-binary-type-for-blob attribute introduced in rev 431161. In other words, the use-binary-type-for-blob attribute is no longer needed.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960929 13f79535-47bb-0310-9956-ffa450edef68
2010-07-06 16:08:51 +00:00
Ashish Vijaywargiya
2c06dd8e5e
Added gram into pound support.
...
Thanks Vivek for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960495 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 09:21:59 +00:00
Jacques Le Roux
f2fbad78d5
Improvement on r960336. Fix a problem reported by Scott on dev ML.
...
I tested locally, and I think I have done it right this time
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960491 13f79535-47bb-0310-9956-ffa450edef68
2010-07-05 09:10:19 +00:00
Jacques Le Roux
82aba53fa5
Improvement on r960336 (should fix a problem reported by Scott on dev ML.)
...
I tested locally, but I'm not quite sure it's sufficient
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960401 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 21:23:47 +00:00
Jacques Le Roux
bc89697809
Found a Jacopo's message while browsing around calendarDateSelect.
...
I have not put pl.js and fi.js because they exist in the calendarDateSelect project.
I'd like to contribute those news to the calendarDateSelect project, but it's not a priority for me
I have asked how to contribute to the calendarDateSelect project
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960376 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 18:22:50 +00:00
Adrian Crum
d898b0b695
Fixed UtilCache.java JavaDoc.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960373 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 18:07:14 +00:00
Jacques Le Roux
92fe067268
Should fix a problem reported by Scott on dev ML.
...
It's related to r886723: I forgot to create an en.js file (used as default).
I have also enhanced the other files but without total guarantee of correctness, at least it's better and improvable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960336 13f79535-47bb-0310-9956-ffa450edef68
2010-07-04 12:59:05 +00:00
Scott Gray
adfa8d36b6
Fix ModelMenuAction.PropertyMap, if the map already existed then it was overwritten instead of being added to. Fixed before merging with ModelWidgetAction so that I can backport to 10.04
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960190 13f79535-47bb-0310-9956-ffa450edef68
2010-07-03 09:50:07 +00:00
Adrian Crum
c255f48060
A little bit of work on the entity condition stuff - no functional change. Improved JavaDocs, eliminated compiler warnings.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@960154 13f79535-47bb-0310-9956-ffa450edef68
2010-07-03 04:27:20 +00:00