Commit Graph
10472 Commits
Author SHA1 Message Date
Erwan de Ferrieres 060a8e14de Adding missing tags in r920770 as spotted on the dev mailing list in the *FormMacroLibrary.ftl files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921099 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 20:22:35 +00:00
Adam Heath 745fab7188 Make the protected static methods public.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921089 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 19:58:36 +00:00
Adam Heath 6122265c29 s/ServiceRegistry/ServiceLoader/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@921085 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 19:52:50 +00:00
Erwan de Ferrieres 245534d516 Adding description and alternate text on a field type="image"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920770 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 10:18:54 +00:00
Scott Gray eb147d0326 Fix a problem reported by Hans Bakker, FreeMarker templates loaded using the Configuration object don't have access to the component:// notation reader and this causes them to fail because all templates now attempt to retrieve the html form macro library using that notation. This is a quick fix but we should really fix the FreeMarkerViewHandler to load templates via the FreeMarkerWorker.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920589 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 00:27:19 +00:00
Scott Gray 42cffa5c24 [CVE-2010-0432] Multiple fixes to the macro and html form widget renderers to ensure that all output is encoded when necessary.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920372 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 16:05:24 +00:00
Scott Gray f507fad221 [CVE-2010-0432] Properly encode any error messages before attempting to write them to the response. I'm doing it here to avoid having to do the encoding within each app's error.jsp file, I think this should be fine though.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920371 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 16:05:19 +00:00
Scott Gray 4d14316c52 [CVE-2010-0432] Added an OFBiz specific FreeMarker TemplateExceptionHandler, ensures that any stack trace error messages are properly encoded before being dumped to the browser (or anywhere else).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920370 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 16:05:14 +00:00
Scott Gray 8d2545c68e [CVE-2010-0432] Menu widget links of type hidden-form were not correctly encoding the value attribute.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920369 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 16:05:09 +00:00
Erwan de Ferrieres 84c5f1b037 When making CSV or PDF exports, and having sort-field as table headers, the descriptions weren't displayed in the exported documents.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920359 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 15:36:04 +00:00
Bruno Busco 0366de6c62 Starting to use the widget macros in FTL files.
Part of OFBIZ-3541

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920117 13f79535-47bb-0310-9956-ffa450edef68
2010-03-07 21:17:54 +00:00
Bruno Busco ef3857b87e Added parameter default values to renderLookupField and renderNextPrev macros.
This allows to call the macro in the FTL files without specifying all the parameters.
Part of OFBIZ-3541

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920116 13f79535-47bb-0310-9956-ffa450edef68
2010-03-07 21:15:36 +00:00
Bruno Busco 458e17a104 The widgets macros are now usable in the FTL files also.
Using these macros in FTL should improve code reuse and avoid having different HTML between widgets based screens and FTL based ones.
This has been developed in OFBIZ-3541.
Thank you Bilgin and Jacques for reviewing and improving the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920115 13f79535-47bb-0310-9956-ffa450edef68
2010-03-07 21:11:16 +00:00
Jacques Le Roux 9014106755 A modified patch from Sascha Rodekamp "Some improvements for the layer lookup" (https://issues.apache.org/jira/browse/OFBIZ-3524) - OFBIZ-3524
A little fix for the faded background and make fading as default.
I have also refactored a bit the lookups examples fields

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920061 13f79535-47bb-0310-9956-ffa450edef68
2010-03-07 19:23:42 +00:00
Bilgin Ismet Ibryam 964bd5fee5 Removed label for geoId ENG, because there is no such an entry. Fix label for geoId ENGL
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920050 13f79535-47bb-0310-9956-ffa450edef68
2010-03-07 18:08:17 +00:00
Erwan de Ferrieres 71ab704a96 Adding missing French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@920019 13f79535-47bb-0310-9956-ffa450edef68
2010-03-07 15:37:14 +00:00
Jacopo Cappellato 1a3a99c892 Improved template code for menu setup; thanks to Chris Snow for the patch (OFBIZ-3539)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@919425 13f79535-47bb-0310-9956-ffa450edef68
2010-03-05 14:09:40 +00:00
David E. Jones 39484e52d2 A better approach for this condition, it isn't just the COUNT function we want to look for, it is ANY function; a reminder for those using this: put the unique field first
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918910 13f79535-47bb-0310-9956-ffa450edef68
2010-03-04 09:24:30 +00:00
David E. Jones 745e671051 Added back code similar to code before to use selected values in a count instead of ignoring them, which is necessary to get a distinct count when you are not selecting all fields/columns; now looks for the SQL generated with the function=count-distinct stuff is used so that it will function the old way and not include the column name at all, so hopefully that will take care of that problem while fixing the main bug of ignoring the selected fields set
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918903 13f79535-47bb-0310-9956-ffa450edef68
2010-03-04 09:03:46 +00:00
Scott Gray f55d6f8fe4 Added missing svn props, no code changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918840 13f79535-47bb-0310-9956-ffa450edef68
2010-03-04 03:37:57 +00:00
Adam Heath 7fc0f4cfdd Remove a bunch of static variables, instead using an AtomicReference and
an instance of EntityConfigUtil to manage everything.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918734 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:15:01 +00:00
Adam Heath ce2d761f51 Bad formatting, { shouldn't be on a line by itself.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918732 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:14:28 +00:00
Adam Heath 083663f6a4 Make use of FastMap's putIfAbsent, and remove an instance of
double-checked-locking.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918731 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:13:52 +00:00
Adam Heath b2ca928774 Remove unnecessary cast when getting from genericDAOs cache.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918729 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:13:25 +00:00
Adam Heath 9627cbc06c Implement proper non-blocking access.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918728 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:12:58 +00:00
Adam Heath b80b40b6d3 For internal classes, you don't need to prefix with the containing
class.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918727 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:12:31 +00:00
Adam Heath 4a52467763 Make all the internal variables private and/or final.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918726 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:12:03 +00:00
Adam Heath 76b4cfb1ac Make all the protected fields private and final.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918725 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:11:35 +00:00
Adam Heath b289b45142 Move the test case for ComparableRange to the correct package.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918724 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:10:52 +00:00
Adam Heath 503c5f9795 Remove javadoc from protected methods.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918723 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:10:11 +00:00
Adam Heath b517a45e60 Fix typo in javadoc parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918722 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:09:36 +00:00
Adam Heath 6b9b1156c3 Set src-dirs correctly.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918721 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:09:08 +00:00
Jacques Le Roux ff4623a475 Re-apply r912645
<<Make use of FSE.expand(), instead of expandString, to provide support
for direct setting of values in widgets.  This closes OFBIZ-3486.>>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918476 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 14:03:19 +00:00
Erwan de Ferrieres bcd5e24034 Upgrading jsgantt.js so it will be possible to display milestones in a Gantt chart
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918340 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 07:03:59 +00:00
Jacques Le Roux 423ce79a21 A slightly modified patch from Sascha Rodekamp " Some improvements for the layer lookup" (https://issues.apache.org/jira/browse/OFBIZ-3524) - OFBIZ-3524
A flag was added to fade the background behind the layered lookup (ie all the screen but the lookup) when a layer is opened.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917940 13f79535-47bb-0310-9956-ffa450edef68
2010-03-02 10:02:04 +00:00
Adam Heath 2ef7601138 Remove a bunch of very simple classes, instead registering abstract
versions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917630 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 18:20:38 +00:00
Adam Heath a98cdfb0e8 Add an AbstractStringToNumberConverter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917629 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 18:20:03 +00:00
Adam Heath 50bee334d9 Add AbstractNumberToStringConverter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917627 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 18:16:27 +00:00
Adam Heath feaa07ed30 s/AbstractToNumberConverter/AbstractNumberConverter/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917626 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 18:15:58 +00:00
Adam Heath 397d41c700 All the Number->Number variants now have generic base classes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917625 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 18:15:24 +00:00
Adam Heath 6afb679a11 Add abstract classes to unify simple object to singleton collections.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917624 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 18:14:19 +00:00
Adam Heath 544927d764 BUG FIX: Actually implement proper simple array testing; the previously
added ArrayObjectToList converter was never actually used.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917623 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 18:12:35 +00:00
Christian Geisert 544118daa4 German label translation
Submitted by Mirko Vogelsmeier
See OFBIZ-3518


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917550 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 14:38:13 +00:00
Bilgin Ismet Ibryam 7479c4d912 Don't return the default message "The action was performed successfully" when call-service element is used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917467 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 11:16:25 +00:00
Adam Heath 3b07b7950d BUG FIX: Move node test to before the loadClass call.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917377 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 05:07:00 +00:00
Adam Heath cabce4bcad BUG FIX: Move the check that tests whether we are converting to the
passed object to before the loadClass call.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917376 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 05:06:16 +00:00
Adam Heath 6f5e964bd4 BUG FIX: When the target type is Object, return the passed value.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917374 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 05:05:43 +00:00
Adam Heath 6502fed7dc BUG FIX: If the object is a string and it is empty, return null early.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917373 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 05:05:10 +00:00
Adam Heath fa5abfa4ce BUG FIX: Throw exceptions instead of logging errors.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917372 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 03:19:08 +00:00
Adam Heath c037f73f05 BUG FIX: Add support for converting to PlainString, which just calls
toString directly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@917371 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 03:18:20 +00:00