Commit Graph
742 Commits
Author SHA1 Message Date
David E. Jones b69664a9d6 Fixed two issues: renderDisplayField macro was missing the title attribute, implemented the multi-position single forms, for a maximum position of 2 anyway
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995313 13f79535-47bb-0310-9956-ffa450edef68
2010-09-09 04:35:26 +00:00
Adam Heath be51724bc6 Expose actions variable to other code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995207 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:48 +00:00
Adam Heath 5ee6d42aef Move duplicated code that has one screen widget calling another screen,
into a global helper method.  Eventually, this method will be altered to
be able to 'change' which screen is actually included, based on various
conditions at runtime.  This will be used to eventually support partial
ajax page updates.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995206 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:42 +00:00
Adam Heath b5b019e4fe DecoratorSection was already fetching its name attribute from the
element; so call getName() on it, instead of fetching the attribute
locally.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995205 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:36 +00:00
Adam Heath 87a61d524f Remember the node's systemId, startColumn, and startLine, and use them
in a default toString() implementation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995204 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:31 +00:00
Adam Heath 3b4793f968 Enable tracking of xml node positions when reading documents.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995203 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:24 +00:00
Bruno Busco 9f557eae9e Added the "default-value" attribute to the "display" tag.
This allows to specify a string to be shown in a display field when it is empty.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992441 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 19:55:08 +00:00
Erwan de Ferrieres 6d59cc8f25 reverting 989475 as it is generating too much backward compatibility issues
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989772 13f79535-47bb-0310-9956-ffa450edef68
2010-08-26 15:41:49 +00:00
Erwan de Ferrieres d6564a8188 when using an entity-condition, the object's attribute name used in condition object parameter was not taken into account
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989475 13f79535-47bb-0310-9956-ffa450edef68
2010-08-26 07:07:12 +00:00
Erwan de Ferrieres 24c97a5b0c Changing functioning for display-size, now displaying dots inside the text instead at the end, so it is more readable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989313 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 19:25:56 +00:00
Erwan de Ferrieres 063d57711c new option for fields : display-size. If a field size is longer than the specified value, then length will be cut and ... will be added. The full text will be displayed as a hint. This way, a form will not be deformed by too long fields.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987127 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 11:12:55 +00:00
Hans Bakker 2d9b75a30f this is a revert of r731487 to downgrade freemarker from 2.3.15 to 2.3.10 because of speed problems. In order to make the older version work we changed the following:
- create new OfbizCatalogUrlTransform class
- delete CatalogUrlDirective.java class
- set ofbizCatalogUrl transform to OfbizCatalogUrlTransform class
- In htmlFormMacroLibrary.ftl file, change floor directive to floor method of Math class
- change freemarker version in .classpath and LICENSE files
We are in discussion with the freemarker developers to solve this problem there.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986577 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 06:33:12 +00:00
Adam Heath b273b52dad Finally created a script to find and fix tons of missing final newlines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@982870 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 04:46:48 +00:00
Scott Gray 4448c4a866 No functional changes, just removing a whole bunch of unused imports and reorganizing them along the way.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981019 13f79535-47bb-0310-9956-ffa450edef68
2010-07-31 08:28:34 +00:00
Scott Gray 787799659a Fix problem rendering content from the screen widget, thanks Hans for the report
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@980687 13f79535-47bb-0310-9956-ffa450edef68
2010-07-30 08:57:40 +00:00
Scott Gray 12807597e2 Temporarly revert my recent changes to renderLink(), a list of maps is being written directly to the macro call and I need to figure out how to support that. Problem reported by Jacques in the dev list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@980238 13f79535-47bb-0310-9956-ffa450edef68
2010-07-28 21:34:03 +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
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
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