Commit Graph
397 Commits
Author SHA1 Message Date
Adrian Crum 5990ac186b Made a few changes to the HTML view handlers. Multiple DOCTYPE declarations were being generated when screens included other screens. Problem reported by Ryan Foster - https://issues.apache.org/jira/browse/OFBIZ-2543.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779751 13f79535-47bb-0310-9956-ffa450edef68
2009-05-28 19:57:53 +00:00
Jacques Le Roux d8ddbf314f Fix a comment and javadoc (I will backport in R9.04 because of javadoc)
A patch from Ashish Vijaywargiya "Wrong Property File Name specified" (https://issues.apache.org/jira/browse/OFBIZ-2495) - OFBIZ-2495


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776594 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 07:10:32 +00:00
Adrian Crum f5473d2589 Updated model widgets to use operator substitution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772709 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 16:58:40 +00:00
Adrian Crum 0654f711a6 Added XML-friendly operator substitution to BeanShell and Groovy. BeanShell already supported operator substitution, but I extended it to convert apostrophes to quotes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772699 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 16:30:02 +00:00
Scott Gray cd6bbff043 Fix the problem of fields without a use-when not overriding fields with a use-when condition OFBIZ-863
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772464 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 23:26:00 +00:00
Scott Gray c17442843c Code cleanup, removed unused imports, some unnecessary casts and one unnecessary null check, changed some whiles to enhanced fors
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771147 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 23:25:57 +00:00
Scott Gray 05f15421aa Fixed a FIXME, moved \n -> <BR/> replacement from the renderer to the html macro
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771146 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 23:04:58 +00:00
Adam Heath 1a31984695 Several minor generics fixes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771124 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 20:35:52 +00:00
Hans Bakker 71c58d0756 portal page generated menu changed other menus when cache was enabled, tabs for spaces and deleted empty forms file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@771035 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 07:38:25 +00:00
Scott Gray d3bb5b5eb1 Fixed issue reported by Sascha Rodekamp on the user mailing list
enableEditValue was being treated like a boolean but was actually a String

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770501 13f79535-47bb-0310-9956-ffa450edef68
2009-05-01 00:36:32 +00:00
Andrew Zeneski f36c5a9335 No longer requiring the boolean field 'expanded' as part of the API; after dicussing w/ Adrian; the FSE can handle pre-expanded strings
Added new API method findMatchingPermission() which takes a regular expression for the base permission returning the value of all matching permissions (see unit tests)
Fixed missing base permission in SecurityData.xml

JIRA OFBIZ-2381


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770401 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 19:14:48 +00:00
Jacopo Cappellato 2d2e4870bf Migrated code, and adjusted to work with the new macro renderers, that implements the in-place editor for display fields.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770243 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 14:32:45 +00:00
Jacopo Cappellato 94b153c12a Fixed wrong name of the key used to retrieve the values for checkboxes; OFBIZ-2391 (thanks to Hans Bakker for the bug report).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770125 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 09:23:35 +00:00
Adam Heath 9840b7cc1c Fix some StringBuffer usage that has crept in.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@770030 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 01:22:44 +00:00
Andrew Zeneski 4027891ed9 integration with new Authz API - JIRA OFBIZ-2381
NOTE: when using the action="" the old API is always used; when no action is specified the new API is used



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@769943 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 21:27:59 +00:00
Jacques Le Roux bf299998db A patch from dukian "Tree widget doesn't apply parameter tag as Menu" (https://issues.apache.org/jira/browse/OFBIZ-2325) - OFBIZ-2325
Thanks to Jacopo's comment which helped a lot to test!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768811 13f79535-47bb-0310-9956-ffa450edef68
2009-04-26 22:14:29 +00:00
Jacques Le Roux ae10eaaed3 Fix a bug (seems a typo), see dev ML for more
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768490 13f79535-47bb-0310-9956-ffa450edef68
2009-04-25 07:34:36 +00:00
Jacopo Cappellato 9eaac35f4d Implemented macros for new renderers methods for creen widgets; cleaned up SimpleDecorator.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@768213 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 07:59:08 +00:00
Adrian Crum 1a4496c172 Some work on the screen widgets:
1. Added renderScreenBegin and renderScreenEnd methods to ScreenStringRenderer.java.
2. Updated HtmlScreenRenderer.java and MacroScreenRenderer.java to emit the <DOCTYPE> element first - before any widget comments or template content.
3. Removed <DOCTYPE> elements from templates that no longer need them.
4. Added screen and section boundary comments to MacroScreenRenderer.java.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767996 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 17:54:30 +00:00
Jacopo Cappellato b9e73fbfbd Fix for NPE reported by Hans Bakker in OFBIZ-2345
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767860 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 08:59:28 +00:00
Jacopo Cappellato eb559a9539 Misc fixes to the macro renderers for widgets, including the fix (by encoding descriptions for the Uom) for the error reported by Ashish in OFBIZ-2337.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767496 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 12:46:51 +00:00
Jacopo Cappellato 914bff7d5c A series of fixes to the new macro widget renderers to better support nested calls to rendering methods; misc fixes to the screenlet pagination code for html. Part of issue OFBIZ-2337
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767455 13f79535-47bb-0310-9956-ffa450edef68
2009-04-22 10:32:57 +00:00
Adrian Crum 68bc161651 Fixed invalid HTML generated by the menu widget. Updated BlueLight theme to use valid HTML.
When creating new themes for OFBiz, it is important to follow the guidelines here:

http://docs.ofbiz.org/display/OFBIZ/OFBiz+maincss.css+HTML+Element+Collection+Styles


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767221 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 16:57:51 +00:00
Jacopo Cappellato d93d61fce4 Initial step for formatting fixes to the html widget macro library to improve readability of html output and macro scripts.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767096 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 09:53:24 +00:00
Jacopo Cappellato 7d4a9baf80 Added missing "
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766015 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 14:02:20 +00:00
Jacopo Cappellato af876f1aa0 Migrated to the form widget macro renderer the code that adds ajax support to submit buttons.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765674 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 16:11:53 +00:00
Jacopo Cappellato f18cea546b Fixed wrong macro call.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765669 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 15:36:53 +00:00
Jacopo Cappellato bbb538d602 Small change to avoid warning messages in console.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765464 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 05:07:26 +00:00
Adrian Crum 6e85ea167b Added "NewList" and "NewMap" options to the <set> element type attribute. Now screen widgets and mini-language support the creation of empty Lists and Maps.
Usage:

<set field="theList" type="NewList"/>
<set field="theMap" type="NewMap"/>



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765284 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 17:44:47 +00:00
Jacopo Cappellato 711a3b619d Mostly completed the implementation of widget macro renderers for xml and text output.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763520 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 06:01:21 +00:00
Jacopo Cappellato a02c3abaa8 A bunch of fixes and enhancements to the new widget renderers based on Freemarker macros.
Converted to new technology the xsl-fo renderer and view handler.
Better handling of platform dependent templates included in screens: the proper one is now choosen according to the name of the renderer; the name is returned by a new method of the widget renderer interface.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763511 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 04:14:38 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacopo Cappellato 640e11b07c Misc fixes and enhancements to the new Macro renderer stuff.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762727 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 12:06:03 +00:00
Jacopo Cappellato 64b3ffefd3 Added some code, commented out, for upcoming (hopefully) implementation of macro renderers for menu and tree widgets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761664 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 13:14:51 +00:00
Jacopo Cappellato 66bd9ee52e Work in progress, commented out for now, to convert table based layout for single forms to divs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761521 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 04:40:18 +00:00
Hans Bakker f1a117cced give error message instead of NPE
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761178 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:20:59 +00:00
Hans Bakker 42a3130c65 only check for privat portal pages in the menu if a user is logged in
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761177 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:18:49 +00:00
Jacopo Cappellato a6c633bf34 Several minor cleanups (most of them are formatting fixes); part of OFBIZ-1235
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761173 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:09:45 +00:00
Jacopo Cappellato 4f98f0c316 Committed patch from Guo Weizhan, part of OFBIZ-1235: mostly completed implementation of the form renderer based on Freemarker macros. The patch contains some small (mostly formatting) issues that I will clean up tomorrow. Now the new renderers and view handlers are ready for testing.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760976 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 17:33:58 +00:00
Hans Bakker 1b23be60c1 cleanup in myportal, move taskslist back to project manager
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759965 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 13:36:47 +00:00
Jacopo Cappellato 9fe4d7064a Reverted some comments that I erroneously committed in rev 759871.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759875 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 08:37:10 +00:00
Jacopo Cappellato 0c987ea969 Applied patch (second part of jis work) from Guo Weizhan for OFBIZ-1235 (new widget renderes based on Freemarker macros): note this is still a work in progress.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759871 13f79535-47bb-0310-9956-ffa450edef68
2009-03-30 08:32:37 +00:00
Adam Heath 453ad64ed5 Fix lines that *only* have whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759246 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:59:28 +00:00
Jacopo Cappellato 559e380427 Applied patch (with minor modifications) from Guo Weizhan for OFBIZ-1235 (new widget renderes based on Freemarker macros): note this is still a work in progress.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759086 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 10:11:46 +00:00
David E. Jones 3c6eb0b5d3 Remove log message I left in there by accidento
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757313 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 03:51:28 +00:00
Adam Heath 4161d4e2bf Fix purely empty whitespace lines, and remove trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757077 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 23:24:58 +00:00
Jacopo Cappellato ceb610498a This is a work in progress for a refactoring of the various screen and form widget renderers; the new renderer will create output by calling Fremarker macros defined in external (configurable) files; the work is still not complete, and for this reason it is not enabled yet. Part of task OFBIZ-1235
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756369 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 08:21:11 +00:00
Jacques Le Roux 0e0519e802 All tabs to 4 spaces in *.groovy, *.java, *.xml
Done with Eclipse S/R "\t"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755696 13f79535-47bb-0310-9956-ffa450edef68
2009-03-18 18:43:49 +00:00
David E. Jones d1d6b46ab8 Added auto option for link-type that will figure out if a hidden-form is needed or not; the hidden-form option will only work for intra-app links that refer to a request that calls an event; changed the ProductForms hyperlink defs to not specify a link-type any more and just use the auto; note that for targets with parameters inline in the URL and not in the parameter sub-element the parameters will still be in the form action and not in hidden fields, so those need to be changed for this to be effective
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755377 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 20:05:34 +00:00
David E. Jones 34f9e0a0f6 Added link-type=hidden-form attribute and parameter sub-element to the menu and screen widget link elements; some refactoring and cleanup to avoid too much code redundancy in this (though there is certainly still quite a bit here); changes the MyPortalMenus.xml#CommSubTabBar to use this since it is an example reported by Bilgin; WARNING: I don't have a good test case for this so testing from Bilgin or I guess Hans would be very appreciated
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@755022 13f79535-47bb-0310-9956-ffa450edef68
2009-03-16 22:12:30 +00:00