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
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
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
Scott Gray
e7f6f4e1eb
Take care of some warnings while I'm in the area, ModelWidget already implements Serializable so ModelScreen doesn't need to mention it.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959902 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 07:52:14 +00:00
Scott Gray
50e4f65d46
Removed all usage of the deprecated ModelScreenAction class
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959898 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 07:49:21 +00:00
Scott Gray
f85c469494
Deprecated ModelScreenAction and it's subclasses, decided it was best to leave the class as is and just switch the screen widget code over to using ModelWidgetAction
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959893 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 07:40:57 +00:00
Scott Gray
831721bc7c
Added a new class ModelWidgetAction which will serve to replace the duplicate classes ModelScreenAction, ModelFormAction and ModelMenuAction. This class is virtually a direct copy of ModelScreenAction and its subclasses. I'll work over the weekend to switch the existing classes to extend from ModelWidgetAction, remove their methods and then deprecate the shells that are left behind.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959875 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 06:38:52 +00:00
Erwan de Ferrieres
093f72b2aa
Removing unnecessary calls to map. Thanks Adrian
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@959291 13f79535-47bb-0310-9956-ffa450edef68
2010-06-30 12:45:55 +00:00
Adam Heath
f685831073
Fix several generics warnings that have crept in.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958273 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 19:40:39 +00:00
Erwan de Ferrieres
f8eac652a7
Allowing parameters in on-event-update-area via parameter child element
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958228 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 14:06:39 +00:00
Erwan de Ferrieres
aefac4fdf0
Allowing parameters in XML forms when using on-event-update-area
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958066 13f79535-47bb-0310-9956-ffa450edef68
2010-06-25 18:32:15 +00:00
David E. Jones
1bcbfd70c4
Fixed issue with XML reserved characters in screen and form data, they will now be encoded and display properly instead of causing an error about bad formatting in an entity
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@957658 13f79535-47bb-0310-9956-ffa450edef68
2010-06-24 18:09:08 +00:00
David E. Jones
43569dfc03
A couple of small changes to fix XSL:FO widget rendering blow ups: in field titles replace nbsp with space, this is necessry since certain forms use this for empty cells so the renderer doesnt use the default title, also changes the screen link and image marcos to have the full parameters in the other files as it was blowing up on that too (ie with parameters passed in that it doesn't know about)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@957362 13f79535-47bb-0310-9956-ffa450edef68
2010-06-23 21:47:41 +00:00
Erwan de Ferrieres
1701c87c03
As spotted by Adrian on the dev mailing-list, this is a better writing
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@954534 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 16:07:16 +00:00
Erwan de Ferrieres
16e8f57957
Allows to parameterize a form id
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@954437 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 13:12:06 +00:00
Jacques Le Roux
4dbc07a799
A patch from Ankit Jain "Missing "not-in" operator in condtion-expr tag." ( https://issues.apache.org/jira/browse/OFBIZ-3819 ) - OFBIZ-3819
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@953671 13f79535-47bb-0310-9956-ffa450edef68
2010-06-11 11:44:34 +00:00
Jacques Le Roux
f2297ffa9e
Improves target-parameter documentation
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@951672 13f79535-47bb-0310-9956-ffa450edef68
2010-06-05 08:21:14 +00:00
Jacques Le Roux
36e3342cd7
Accurate documentation
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950683 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 17:37:36 +00:00
Jacques Le Roux
d75fbce90a
Allows to initially collapse the search screenlet of a layered lookup, default to false.
...
It was harder than I though because of the async nature of Ajax. So I had to use a setTimeout with a 400 ms timeout. Hopefully it will work in any environments. I chose 400 because I found it worked well on my machine, 300 also but to be sure I picked 400, 200 was too low it seems.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950481 13f79535-47bb-0310-9956-ffa450edef68
2010-06-02 10:44:16 +00:00
David E. Jones
0befa87923
Added id to field titles to allow more direct styling, hiding/showing, etc
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950019 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 11:12:40 +00:00
David E. Jones
60fb1968f8
Changed the screenlet -> initially-collapsed attribute to support string expansion, includes xsd change; this allows custom logic to determine if the screenlet should appear collapsed or not
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949880 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 22:40:19 +00:00
Jacques Le Roux
32c8b8fb72
Better documentation on client-autocomplete-field
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949839 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 19:33:55 +00:00
Jacques Le Roux
1e9824ab0c
* Remove useless white spaces in macro (make harder handling links in javascript)
...
* Implement target-parameter in case of layered lookup (was missing)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949710 13f79535-47bb-0310-9956-ffa450edef68
2010-05-31 10:33:52 +00:00
Jacques Le Roux
1105653227
Add documentation to description-field-name attribute in lookup
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@947005 13f79535-47bb-0310-9956-ffa450edef68
2010-05-21 13:44:41 +00:00
Adrian Crum
b832282533
Updated model widgets to eliminate calls to methods deprecated in previous commit. Widget comment state is stored in the renderer, not in the model. All widget comments work properly now.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@946431 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 21:57:18 +00:00
Adrian Crum
16929cabeb
Small change to ModelWidget.widgetBoundaryCommentsEnabled method - added ability to pass the rendering context in addition to the request parameters, plus I fixed the logic so it works the way it was originally intended.
...
To summarize:
1. The widget.verbose property in widget.properties is the global default setting.
2. The setting can be changed at the application level by putting the widgetVerbose parameter in the web.xml file.
3. The setting can be changed at the widget level by putting the widgetVerbose variable in the rendering context.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@946384 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 20:49:06 +00:00
Adrian Crum
30a5cffa2c
Moved 4 methods from ModelWidget to WidgetWorker and made them static. ModelWidget is supposed to be nothing more than a super class for the model widget classes, but it was starting to look like a "catch-all" or utility class.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@946298 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 17:38:08 +00:00
Adrian Crum
f44fb0e298
Reverting 946262 and 946264. The changes compiled okay, but they wouldn't run.
...
I'm going to take a different approach in a future commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@946286 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 17:08:39 +00:00
Adrian Crum
0121b2bab3
Deprecated some methods in ModelWidget.java that are not thread-safe. Plus, the implementation of widget comments was flawed. Widget comments can be enabled/disabled on a per-request basis, but the setting was saved on a per-widget basis.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@946270 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 16:50:27 +00:00
Adrian Crum
aea89155d3
Changed two more ModelWidget.java methods to static.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@946264 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 16:36:58 +00:00
Adrian Crum
1598bfb858
Changed two ModelWidget.java methods to static.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@946262 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 16:30:06 +00:00
Erwan de Ferrieres
9e7053e953
XHTML validation errors round 2++ (framework) - OFBIZ-3761 ( https://issues.apache.org/jira/browse/OFBIZ-3761 )
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945582 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 10:34:42 +00:00
Adrian Crum
f485030987
Small fixup for my previous commit.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945324 13f79535-47bb-0310-9956-ffa450edef68
2010-05-17 19:26:20 +00:00
Adrian Crum
e9c4e5c9c5
Converted screen widget sub-widget creation over to the factory pattern. Users can create their own sub-widgets to augment or replace the existing ones.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@944898 13f79535-47bb-0310-9956-ffa450edef68
2010-05-16 19:31:19 +00:00
Bruno Busco
4e389ec6b1
Bug Fix: The pagination controls at the top of the form are not rendered for "multi" forms but only for "list" forms.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@944669 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 15:42:08 +00:00
David E. Jones
602873de70
Made widget link parameter treatment more consistent; before if you specified a paramaeter name without a from-field then it wouldn't convert the object according to locale; now it does the same thing no matter where the object comes from (ie explicit from-field or implied by the parameter name); this fixes a timeZone inconsistency that causes links with time/timestamp parameters to not work
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@943843 13f79535-47bb-0310-9956-ffa450edef68
2010-05-13 08:32:09 +00:00
Jacques Le Roux
25f33ca608
Try to keep things clean (well formatted)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@942702 13f79535-47bb-0310-9956-ffa450edef68
2010-05-10 10:12:18 +00:00
Jacques Le Roux
b2b396cee1
Makes things clear: documentation never hurt (when accurate)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@942668 13f79535-47bb-0310-9956-ffa450edef68
2010-05-10 06:42:28 +00:00
Scott Gray
0f30714350
Set svn properties on all freemarker files that were missing them
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@942386 13f79535-47bb-0310-9956-ffa450edef68
2010-05-08 13:51:19 +00:00
Erwan de Ferrieres
4c87323d82
Modification on previous commit (941261) : we need to return an empty string if there is no value found for the key, regardless of whether debuging is on or off
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941600 13f79535-47bb-0310-9956-ffa450edef68
2010-05-06 07:56:23 +00:00
David E. Jones
a89f19306e
Improved error message when screen marco rendering fails to show the macro icall text to give you a clue about what failed
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941329 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 14:53:03 +00:00
Erwan de Ferrieres
c2ecf31559
A slighty modified patch from Chris Snow "Field description tooltips show key if help text is not found" OFBIZ-3749
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941261 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 11:53:06 +00:00
Scott Gray
87d4de1711
Missed one of the calls to the now deprecated methods. Removed a couple of unnecessary casts while I was at it.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941205 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 08:51:07 +00:00
Scott Gray
2ed23a85e6
ModelMenu objects were being instantiated with (and then keeping references to) Delegator and LocalDispatcher objects. Obviously not ideal for multi-tenanting and the like.
...
To fix:
- Deprecated the ModelMenu constructor and replaced it with one that doesn't take a delegator/dispatcher
- Removed ModelMenu's dispatcher/delegator fields and deprecated the get methods for them
- Took the getDispatcher and getDelegator methods from ModelForm and pushed them down to ModelWidget so that they can be used by ModelMenu as well
- Deprecated the MenuFactory methods that take delegator/dispatcher and replaced them with ones that don't
- Altered any code that was using the newly deprecated methods
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941181 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 07:17:12 +00:00
Scott Gray
549302a5de
Remove a couple of unnecessary casts
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@941178 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 07:16:55 +00:00