Commit Graph
374 Commits
Author SHA1 Message Date
David E. Jones 7d5264a0e8 Fixed appbar issue with html encoding, so general encoding turned back on too
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742030 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 09:05:45 +00:00
David E. Jones 8eb602faf7 Commented out lines that cause the general html encoding, need to track down problem with app bar in manager apps
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742016 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 08:18:37 +00:00
David E. Jones ebd5c3e78f Implemented StringModel extension and BeansWrapper extension to load it in order to encode strings for HTML use; this is only done throught the HtmlWidget class that is part of the screen widget, so won't interfere with other FTL uses; note that there is other experimental code in here for wrapping the GenericValue object for html encoding, but that option wasn't very complete so went this way instead; this option behaves better and is more transparent than that escape x as x?html option for FTL files; there are also a few cleanups of typos and things in here; note that this means we have a different Configuration object and so a different template cache, and so we have different cache settings and such; after applying this I found a few places that encoded things they shouldn't but for the most part it is pretty good; will be committing some changes in applications in a bit to resolve a couple of these issues in ecommerce; all should watch out for funny things showing up as HTML text instead of being interpreted by the browser as HTML, meaning it was encoded; in extreme cases just comment out lines 71-73 of HtmlWidget.java to turn off this encoding
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742013 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 07:40:40 +00:00
David E. Jones cea6620fbd Added general usage of ESAPI HTML and XML encoding for the form widget; removed the old partially implemented use of the StringEscapeUtils stuff; includes attribute on the form field element called encode-output that is true by default so if HTML encoding is not desired then must be set to false
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741857 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 08:56:19 +00:00
David E. Jones afb434f132 More log message refinements for more info, but less message and noise
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741742 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 21:37:42 +00:00
David E. Jones 3f3f0008d8 Some small changes so that something like the recent nbsp in a labels file won't cause everything to fail, ie just noisily log the error and treat the file/label as missing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741692 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 19:45:53 +00:00
David E. Jones afe3dc9c81 A few related changes:
Big refactor of ControlServlet, RequestManager, RequestHandler, and ConfigXMLReader so that simple objects are used instead of Maps within Maps within Maps for the data from the controller.xml file, which results in eliminating hundreds of lines of code including the entire RequestHandler class. I have tested this a lot with different apps that use the ControlServlet differently, but this is a very big change so there could still be issues. Based on this cleanup future issues and new features should be easier and less error prone, and that is why doing it now in order to help with a number of other improvements and bug fixes that are part of this commit.

Also added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues with form data, but if the ID to display (like following a crAlso added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues with form data, but if the ID to display (like following a crAlso added redirect-parameter element to go under the request-map -> response element which allows you to specify which parameters will be passed on in a redirect instead of using all of them. Also improved default there and in various places to only include parameters from the URL to avoid issues wd in and also going to the same page after login from auth=true or from clicking on the login link.

Related to cleaning up login URLs also changed how the request and parameters passed to a request before a login are saved and used after a login is successful so that it URL parameters go on the URL in a redirect to the original request to make it more transparent, and non-URL parameters just stay in the session and are used when the original request is run again to avoid putting sensitive information like passwords and big information like textarea data in the URL, which has been a problem before.

To see what some of these things combined can do try going to the example app, login, click on the New Example link, then logout in another tab or window, then go back to the New Example page and enter a name and a whole bunch of text in the long description then click Create, the system will show you the login page so enter username/password, and then after login you'll see a nice URL to EditExample with the correct exampleId parameter and all of the data entered before login successfully saved and never appearing in a URL.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741374 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 02:14:19 +00:00
Jacques Le Roux 5c95acc38d Thanks to Labels Manager the French translation is now complete
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@740338 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 16:24:30 +00:00
Jacopo Cappellato e1b1c85e1e Added two new methods to the ViewHandler interface: getter/setter methods for the "name" field, used to store the name of the view handler as set in the controller.xml file.
No functional change, but this mode is required by the upcoming new screen renderer based on Freemarker macros.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739792 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 17:12:19 +00:00
Jacopo Cappellato f9572816da Fixed typo in a comment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739790 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 17:00:13 +00:00
Jacques Le Roux 12fd67fe8c Enhancement from Karim Rahimpur
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739219 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 09:26:21 +00:00
Hans Bakker 40f67a85d4 another error message improvement on the form type which can be confused with a service attribute type
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739195 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 07:02:59 +00:00
Jacques Le Roux 2cd3740648 A slightly modified patch from Karim Rahimpur "Localized values are not retrieved from LocalizedMaps (through BasicVariableMapper)" '(https://issues.apache.org/jira/browse/OFBIZ-2148) - OFBIZ-2148
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@738870 13f79535-47bb-0310-9956-ffa450edef68
2009-01-29 14:50:45 +00:00
David E. Jones ebc039406c Chanded a few more attribute names for consistency, based on feedback from Marco
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737194 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 21:30:17 +00:00
Jacques Le Roux 572b7683e0 All tabs to 4 spaces in *.groovy, *.java, *.xml : less problems in future with that aspect...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737003 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 11:08:47 +00:00
David E. Jones 806eb98c1b Applied patches from Bruno Busco in Jira #OFBIZ-2118 to add flexibility to menus and themes for more dramatic changes in themes, includes patches AppMenuDropDown.patch and VisualThemeMessage.patch
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736887 13f79535-47bb-0310-9956-ffa450edef68
2009-01-23 01:50:28 +00:00
David E. Jones a1e6d5a63c Changed field-map attribute env-name to from-field to be more consistent; already supported as used through EntityFinderUtil.makeFieldMap; thanks to Marco for the heads up on this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@736832 13f79535-47bb-0310-9956-ffa450edef68
2009-01-22 22:34:01 +00:00
David E. Jones c9868e39dc One last attribute cleanup that I missed before, thanks to Marco for noticing this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735966 13f79535-47bb-0310-9956-ffa450edef68
2009-01-20 08:40:48 +00:00
David E. Jones 66a309aaa1 Fixed issue with some redundant rendering for lookup fields, reported by Hans Bakker
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735397 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 08:21:52 +00:00
Jacques Le Roux 3c1e545b85 Partial Cleanup_labels34.patch from Marco Risaliti 'Clean up labels" (https://issues.apache.org/jira/browse/OFBIZ-1780) - OFBIZ-1780
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735315 13f79535-47bb-0310-9956-ffa450edef68
2009-01-17 17:34:48 +00:00
David E. Jones 90b615ae1a A few enhancements, including some fixes and enhancements for the loopkup field type to support the sub-hyperlink which was already in the xsd, the asterisk for required fields, and the on event stuff for the ajax auto-complete and other such things; also changed all fields to have a default id with formName_fieldName so that it doesn't always have to be explicitly declared but also won't conflict form multiform screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@733486 13f79535-47bb-0310-9956-ffa450edef68
2009-01-11 16:35:46 +00:00
David E. Jones c4602119e7 Changed screen, form, menu and tree widget actions and conditions to be consistent with simple-method cleanups, includes XSD and java changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@733436 13f79535-47bb-0310-9956-ffa450edef68
2009-01-11 09:19:34 +00:00
Adrian Crum 601065aa24 Fixed bug introduced by recent Double to BigDecimal refactor - reported on user mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@733283 13f79535-47bb-0310-9956-ffa450edef68
2009-01-10 15:23:18 +00:00
Adrian Crum 35610c22c7 Fixed a problem in FormFactory.java where an endless loop could occur with the right combination of extended forms - reported in https://issues.apache.org/jira/browse/OFBIZ-1914.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@733087 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 17:09:28 +00:00
Adrian Crum 47e673ac05 Improved version of previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732100 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 20:30:10 +00:00
Adrian Crum a5ef4a126c Fixed a bug where a login prompt appeared in lookup windows when cookies are disabled - reported in https://issues.apache.org/jira/browse/OFBIZ-253.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732083 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 19:53:12 +00:00
David E. Jones 874f02e9da Manual merge of typecheckcleanup200810 branch as of rev 731346 in that branch, resolved all conflicts; with this BigDecimal is not the native type for many entity fields and is used for many calculations; some work is still needed in certain areas of the project but this covers the most critical ones; thanks especially to Scott for his work on this
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731851 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 07:13:36 +00:00
Jacques Le Roux 588fc11dbf Fix an issue introduced in r725053. This commit managed "multi-pagination in a page" see https://issues.apache.org/jira/browse/OFBIZ-1935
This is a quick fix. I wonder if we should keep the screenlet navigation-form-name attribute (at least as is). This for 2 reasons:
. Less informations/features than with default (pages numbers, ability to jump to any page)
. The last button does not always work (try with widget.form.defaultViewSize=2 when listing invoices)

On the other hand it's cool to have all informations in the screenlet. But then we should extend it to work for the 2 points above

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@729402 13f79535-47bb-0310-9956-ffa450edef68
2008-12-25 08:30:30 +00:00
Adrian Crum 03ae66d708 Implemented FlexibleMapAccessor.getInstance() in the remaining classes. Deprecated the FlexibleMapAccessor constructor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726260 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 19:25:33 +00:00
Adrian Crum e4c9442ed6 Oops, I missed a couple of files in my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726252 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 18:26:52 +00:00
Adrian Crum 07e8661959 Implemented FlexibleMapAccessor.getInstance() in the screen widgets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726246 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 18:13:05 +00:00
Jacques Le Roux 52595e4f48 A slightly modified patch from Bilgin Ibryam "Allow multi-pagination in a page" (https://issues.apache.org/jira/browse/OFBIZ-1935) - OFBIZ-1935
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@725053 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 10:39:16 +00:00
Adam Heath 3935ab51c0 Implement multiple resource loading from the classpath; this means
that framework doesn't have to reference transforms that exist in
later components.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@718491 13f79535-47bb-0310-9956-ffa450edef68
2008-11-18 06:09:58 +00:00
Jacques Le Roux bd0213dfa3 A patch from Nicolas Malin " Add filter on list to apply specific style" (https://issues.apache.org/jira/browse/OFBIZ-2032) - OFBIZ-2032
As suggested by Scott, Nicolas has replaced filter by altRowStyle, all is ok


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@711987 13f79535-47bb-0310-9956-ffa450edef68
2008-11-06 22:04:10 +00:00
Jacques Le Roux 12f2d297e4 Fix last commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@709984 13f79535-47bb-0310-9956-ffa450edef68
2008-11-02 23:02:18 +00:00
Jacques Le Roux e57e43fcc4 I forgot initially-collapsed in previous commit.
Put some documentation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@709871 13f79535-47bb-0310-9956-ffa450edef68
2008-11-02 11:46:09 +00:00
Jacques Le Roux 30c6b789e2 Put requirementMethodEnumId in Inventoy fields group
And I forgot to update XSD in r707768 (OFBIZ-1992)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@709844 13f79535-47bb-0310-9956-ffa450edef68
2008-11-02 05:04:59 +00:00
Adam Heath 483e01ac49 Remove all empty javadocs, that only contain an empty @return.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@709642 13f79535-47bb-0310-9956-ffa450edef68
2008-11-01 04:06:23 +00:00
Bilgin Ismet Ibryam 09e537a333 A patch from Dimitri Unruh "Generate alt-attribute in the image element" - OFBIZ-1954
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@707800 13f79535-47bb-0310-9956-ffa450edef68
2008-10-25 00:42:11 +00:00
Jacques Le Roux a4382879e2 A patch from Bruno Busco "Collapsible field-group" (https://issues.apache.org/jira/browse/OFBIZ-1992) - OFBIZ-1992
I only added i18n (in renderFieldGroupOpen) and l10n (all in CommonUiLabels.xml) and made some changes in grouping


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@707768 13f79535-47bb-0310-9956-ffa450edef68
2008-10-24 22:26:46 +00:00
Jacques Le Roux 2240a68a52 Some formatting for List-Multi form column sorting, no code changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@702861 13f79535-47bb-0310-9956-ffa450edef68
2008-10-08 13:12:16 +00:00
Bilgin Ismet Ibryam 2687706c7c Applied the patch from JIRA Issue # List-Multi form column sorting". Thanks to Bruno Busco for helping and patience.
As this is my first commit to framework, I'd really appreciate if you could review this commit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@702236 13f79535-47bb-0310-9956-ffa450edef68
2008-10-06 19:29:40 +00:00
Adam Heath e90eec622e Some more minor code things, generics, string + -> StringBuilder,
javolution, Integer object creation, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@697890 13f79535-47bb-0310-9956-ffa450edef68
2008-09-22 16:27:27 +00:00
Jacques Le Roux bad4459c5b Patches from Bruno Busco & Bilgin Ibryam "List and Multi form pagination labels are not localized" (https://issues.apache.org/jira/browse/OFBIZ-1922) - OFBIZ-1922
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@691953 13f79535-47bb-0310-9956-ffa450edef68
2008-09-04 09:41:43 +00:00
Adrian Crum fa0acffa98 Menu widget extend actions bug fix, and some other work.
I changed the LinkedList objects to ArrayList - because ArrayList is more appropriate for the "build once, read many" type use. It also takes less memory.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@690740 13f79535-47bb-0310-9956-ffa450edef68
2008-08-31 17:29:38 +00:00
Scott Gray 6e13666d81 Add groovy support to menu actions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689776 13f79535-47bb-0310-9956-ffa450edef68
2008-08-28 10:25:14 +00:00
Hans Bakker a16c35484c OFBIZ-1934: Ignore property for condition-expr tag, excellent contribution by Bruno Busco
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689713 13f79535-47bb-0310-9956-ffa450edef68
2008-08-28 04:17:48 +00:00
Scott Gray d401ccbba3 A better fix for the work I committed in rev. 684244
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@689040 13f79535-47bb-0310-9956-ffa450edef68
2008-08-26 11:58:19 +00:00
Jacques Le Roux d1587f0e0a I crossed an error related to this, yesterday while trying to fix https://localhost:8443/facility/control/ViewFacilityInventoryByProductReport?action=Y&facilityId=WebStoreWarehouse&productTypeId=FINISHED_GOOD&productsSoldThruTimestamp=2008-08-25%2013:45:28.625
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688700 13f79535-47bb-0310-9956-ffa450edef68
2008-08-25 11:46:11 +00:00
Jacques Le Roux a92fbb545d While at it some formatting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@688485 13f79535-47bb-0310-9956-ffa450edef68
2008-08-24 10:02:10 +00:00