Commit Graph
1568 Commits
Author SHA1 Message Date
Scott Gray a0771ae85d Remove method that was a duplicate of the superclass method
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039772 13f79535-47bb-0310-9956-ffa450edef68
2010-11-27 22:14:35 +00:00
Scott Gray 4ec14a82cb Remove redundant null check
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039771 13f79535-47bb-0310-9956-ffa450edef68
2010-11-27 22:14:25 +00:00
Scott Gray 5d3699e21b Formatting cleanup, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039770 13f79535-47bb-0310-9956-ffa450edef68
2010-11-27 22:14:16 +00:00
Scott Gray 3f34e1fdef Deprecated the ContainerField's id field and getter/setter, this sort of thing is already handled by ModelFormField
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039769 13f79535-47bb-0310-9956-ffa450edef68
2010-11-27 22:14:07 +00:00
Scott Gray 8391f99d84 [OFBIZ-4036] Form widget display field descriptions were still being encoded when encode-output was set to false. Bug reported by Bruno Busco.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039767 13f79535-47bb-0310-9956-ffa450edef68
2010-11-27 21:51:01 +00:00
Jacques Le Roux 66c5dd10a0 A patch from Dukian "Add Traditional Chinese translation for applications, ecommerce, and ofbizsetup" (https://issues.apache.org/jira/browse/OFBIZ-4031) - OFBIZ-4031
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1039574 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 21:56:14 +00:00
David E. Jones 872a21e20a Improved error message when map-name for field isn't a Map
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1038893 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25 02:04:30 +00:00
David E. Jones 524525fa00 Fixed bug with new group-columns attribute when set to false the hidden fields were not rendering
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1038487 13f79535-47bb-0310-9956-ffa450edef68
2010-11-24 05:51:12 +00:00
David E. Jones b720b413a1 Added new group-columns attribute to form element to not group input/other columns if not desired, defaults to true which is the old/original behavior
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1037146 13f79535-47bb-0310-9956-ffa450edef68
2010-11-20 09:32:30 +00:00
Jacques Le Roux 4bf70deef8 Fixes "Changing the locale (language) from the 1st screen of Order Entry is faulty" (https://issues.apache.org/jira/browse/OFBIZ-4016) - OFBIZ-4016
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1034179 13f79535-47bb-0310-9956-ffa450edef68
2010-11-11 22:19:54 +00:00
Hans Bakker f254de6344 allow the usage of double quotes in the dropdown text
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1027400 13f79535-47bb-0310-9956-ffa450edef68
2010-10-26 08:29:09 +00:00
Bruno Busco 79d86ffa14 Improved include-portal-page widget.
- Changed edit-mode attribute to conf-mode
- Added a use-private attribute. This is "true" by default but can be set to "fasle" if the include-portal-page must render a specific PortalPage without checking if a derived private PortalPage copy exists (i.e. in PortalPageAdmin screens)
- Fixed Portlet attributes retrieval. After each portlet rendering the attributes are removed from the context so that another instance of the same portlet in the same PortalPage that has no attribute value specified falls back to default values and not to the values of the previous portlet.
- The up/down/left/right portlet icons use the same service used for the Portlet Drag and Drop. (This is not working yet. Needs a next commit)
- Few portlet style and labels updates


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023197 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 06:58:25 +00:00
Bruno Busco 4e2f5f67ba - Moved method getPortalPages from ModelMenuItem to the PortalPageWorker. This is a method that generally retrieves all PortalPages that have a common parent. It will be re-used in a next commit.
- Added method to the PortalPageWorker to retrieve a PortalPage considering if a private derived copy exists for the current user (will be used in a next commit)
- Added method to the PortalPageWorker to check if the current user is allowed to configure a PortalPage.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023194 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 06:01:16 +00:00
Erwan de Ferrieres 4de902af7a title was missing in renderDisplayField macro
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1004391 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 20:17:06 +00:00
David E. Jones 8c6f5defdf Added error message for when entity name is wrong instead of an NPE
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1004343 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 18:05:26 +00:00
David E. Jones 7fd290ef8e Removed very old functionality for form widget field actions entity-and and entity-condition that put their results automatically in the context with the field name from the form's list-name attribute, causing it to overwrite any existing list that might be in place for that; the effect was that you could not have any entity-and or entity-condition actions other than the one for the list or multi form's main list to iterate over; the proper way to do this for years now has been to specify which list you want, and this functionality was from the original approach where it was assumed for multi and list forms that you would only have one such query in the actions (which was an add-on to the original functionality that I never liked)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1001330 13f79535-47bb-0310-9956-ffa450edef68
2010-09-25 22:44:13 +00:00
David E. Jones 0155bbdb93 Added another BshInterpreter clear to fix the problem where a value set in row-actions was not available to use-when conditions, or any BSH run within that row
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1001326 13f79535-47bb-0310-9956-ffa450edef68
2010-09-25 22:20:29 +00:00
David E. Jones 1461401e71 Fixed NPE when a form field use-when attribute evaluates to null
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1001325 13f79535-47bb-0310-9956-ffa450edef68
2010-09-25 22:18:12 +00:00
David E. Jones 9cb27b35f7 For form widget checkbox fields the id is now generated in the HTML for the first checkbox; this is mostly useful for single checkbox fields such as when using a checkbox instead of a Y/N drop-down
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@999663 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 21:55:16 +00:00
Bruno Busco 2704f7f99f - Removed several ***Adm requests from webtools application. Used view-last/save-last-view pattern instead to have the same portlet handling requests usable from everywhere.
- Replaced AddPortlet request and view-map with addPortlet. This seems to be the standard we use.
- Portlet attributes are now edited using a dedicated screen. This is how it works in the new PortalPage widget. I used the same system in the actual PortalPage system also because it was too complicated to handle it in two different way. In any case it should not hurt.
- Removed a debug string in the PortalPageColumn renderer.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998686 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 15:46:17 +00:00
Hans Bakker a2d3028094 <subcontent not working, was showing in the new article function of the content blog part
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998585 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 02:52:49 +00:00
Bruno Busco 3bbd2d8598 Added the <include-portal-page> widget. OFBIZ-3625 https://issues.apache.org/jira/browse/OFBIZ-3625
Using this widget, a PortalPage can now be easily rendered in any screen.
At the bottom of the page an "Edit ON/OFF" button can be used to switch the PortalPage edit mode ON and OFF so that the Portal Page can be edited "in place".
All the portlet editing requests are handled using the "save-last-view" request attribute so that a dedicated screen can be shown to set the Portlet attributes and the column width and, when submitted, the user is taken back to the portal page he was editing.

Those new requests will be used in a later commit to eliminate all the duplicated ****Adm requests that have been introduced when the Webtools portal admin screen has been created.
A simple use of the widget has been added in the Example application.

TODO:
- At the moment the portal page editing is performed on the portal page itself and no portal derivation from the "main" one is performed. This will be done in a later commit.
- The portlet moving controls both manually and by drag and drop have not been implemented yet.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998570 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 00:09:39 +00:00
Jacques Le Roux 8bf826b12f Re-apply r997397 without Nicolas's patch
Fix a bug reported by Wang Suozhu at "$ (Rp.event? Html) What do you mean?" (https://issues.apache.org/jira/browse/OFBIZ-3939) - OFBIZ-3939" D:/WorkspaceNew/vinopsTrunk/ofbiz/framework/widget/templates/htmlFormMacroLibrary.ftl

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997431 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 18:01:38 +00:00
Jacques Le Roux 0fbfa9af7b revert r997397, a patch from Nicolas from https://issues.apache.org/jira/browse/OFBIZ-3920 which I have not yet tested slipped in
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997428 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 18:00:02 +00:00
Jacques Le Roux 6bff0778cf Fix a bug reported by Wang Suozhu at "$ (Rp.event? Html) What do you mean?" (https://issues.apache.org/jira/browse/OFBIZ-3939) - OFBIZ-3939
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997397 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 17:00:02 +00:00
Jacques Le Roux 653f7d372d To keep things consistent with r966202 and while at it I have also handled the action/event couple in HtmlFormRenderer.java.renderDateTimeField()
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995771 13f79535-47bb-0310-9956-ffa450edef68
2010-09-10 12:30:11 +00:00
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