David E. Jones
29d2f40e84
Fixed issue reported by Hans Bakker which shows up in the strange situation for the content/views/Xxx URLs because they chain to a request with no event, and that was causing the overrideViewUrl to not get set to be picked up later when it is time to render the view; that is now fixed and the WebSite -> CMS tab is working again in the Content Manager
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744020 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 07:38:18 +00:00
Hans Bakker
8c3bf300e4
fix NPE error reported by BJ Freeman in the mailing list
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743998 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 05:45:22 +00:00
David E. Jones
6c7938c134
Small change to suppress warning
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743984 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 04:50:55 +00:00
David E. Jones
26ad14469a
Fixed bug when there is not security element, certain values were not getting initialized; also fixed bug caused when default-request is not specified
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743822 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 18:15:35 +00:00
Hans Bakker
2a8d8edea4
small correction
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743657 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 08:45:11 +00:00
Hans Bakker
daebecd9d5
created a new attribute on the menu widget: portal-page. With this change the example component is now changed back to use the menu widget again however also serving the portal page buttons
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743639 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 07:26:16 +00:00
Hans Bakker
12ae876822
primarykey definition on the wrong place
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743637 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 07:20:01 +00:00
Hans Bakker
1aa2d0af61
do not display portalpage button when the portalPagename is empty
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743605 13f79535-47bb-0310-9956-ffa450edef68
2009-02-12 02:53:19 +00:00
Adrian Crum
86b75fa340
Oops, I meant to clean up this code before committing.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743440 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 18:22:19 +00:00
Adrian Crum
8db1e5be50
Added util:urlExists(String url) function to the UEL functions. This should be helpful for testing if a file exists before trying using it.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743436 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 18:19:11 +00:00
Adrian Crum
79439bb454
Expanded the comments in the locale-related general.properties settings. Hopefully this will help clear up confusion about what the properties do. No functional change.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743407 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 17:12:09 +00:00
Hans Bakker
c2cc7aa885
If the portalpage name is deleted the page does not show in the menu. This will enable the possibility to remove system pages
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743248 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 06:45:41 +00:00
Hans Bakker
8d417276ac
The MyPortal component has now at least the functionality of the old mypage component with the portal functions included. Mypage is now taken off the menu and will be removed the coming weeks when no big problems arise
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743245 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 06:22:53 +00:00
Hans Bakker
cf0b7986c1
sort portal pages
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743213 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 04:26:24 +00:00
David E. Jones
b8707a26f8
Applied patch from Bruno Busco in Jira #OFBIZ-2172 with basics for VisualThemeSet; still not possible to change themes in ecommerce (should probably be supported on the back end instead of the front end, ie in the catalog manager and not by a customer in ecommerce, or perhaps only allowed in ecommerce if a flag on the ProductStore says its okay; also does not yet filter selectable themes in the back-end/manager applications
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743202 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 03:19:19 +00:00
Hans Bakker
541e72feb5
correction on last commit
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743199 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 03:00:30 +00:00
Hans Bakker
1f1e7bb4e4
update/display portlet sequence corrected, also seed data corrected
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@743000 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 15:48:08 +00:00
David E. Jones
5dd06ae942
Fixed NPE when a request doesn't have an event that was causing the ArtifactInfo stuff to not successfully load
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742996 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 15:32:41 +00:00
David E. Jones
276dbd183b
Fixed changes from rev 742983 that caused a double question mark (?) for request-redirect responses with redirect-parameter sub-elements by changing the code for the case without redirect-parameter sub-elements to have a question mark, which was missing
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742991 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 15:16:00 +00:00
Jacques Le Roux
02d30e60fe
A patch from Arun Patidar "Fixed the bug when response type is 'request-redirect' and query string is available." ( https://issues.apache.org/jira/browse/OFBIZ-2179 ) - OFBIZ-2179
...
Not sure it's the best fix as maybe it fixes only the effect and not the cause, but at least for now it works!
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742983 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 14:36:21 +00:00
Jacques Le Roux
e46e3c34e4
A patch from Marco Ruocco "Error using the UtilDateTime.addDaysToTimestamp method" ( https://issues.apache.org/jira/browse/OFBIZ-2177 ) - OFBIZ-2177
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742933 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 10:47:01 +00:00
David E. Jones
50240bf17f
Fixed issue with general html encoding in edit portal page template, reported by Hans
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742866 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 06:43:05 +00:00
Hans Bakker
921a74c3f4
as reported in the mailinglist, lookups now working
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742862 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 06:09:26 +00:00
David E. Jones
c1cf18c5a2
Removed response.encodeUrl and funny URL patterns not using @ofbizUrl; resolves issues between those and the new general html encoding
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742860 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 05:45:40 +00:00
Hans Bakker
b021dfe8f6
improve error message, corrected creation of a primamry key sequence
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742842 13f79535-47bb-0310-9956-ffa450edef68
2009-02-10 04:06:32 +00:00
Jacques Le Roux
10d468f314
Fix an issue about Delivery Schedule Info reported on user ML. I checked it's fine in other cases.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742716 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 20:16:15 +00:00
Jacques Le Roux
8a8b5eaada
This fix a problem reported on user ML and close ( https://issues.apache.org/jira/browse/OFBIZ-2171 ) "success messages are not displaying properly." - OFBIZ-2171
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742668 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 18:32:58 +00:00
Hans Bakker
6075d20785
some more fault fixes in myportal
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742559 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 15:20:17 +00:00
David E. Jones
0b71effc99
Added new shorter method to StringUtil called wrapString for getting a StringWrapper; added shared variable for StringUtil that is always there in FTL files so when string wrapping is needed one can just use StringUtil.wrapString(); added examples of this for the ProductPromo.promoText field in ecommerce; also set services for that field to allow safe html
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742442 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 12:20:55 +00:00
David E. Jones
5d8d243a26
A simple StringWrapper object that can be used to get around the general HTML auto-encoding now done in FTL rendered through the Screen Widget; just call the static method to wrap it and it will insert fine and the encoder will leave it alone
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742412 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 11:55:07 +00:00
David E. Jones
09825430f1
Added new allow-html tag on the attribute, auto-attribute, and override elements; has 3 options: none, safe, and any; the comments in the XSD file describe what each of these do; the important thing to know is that none is the default meaning no html is allowed; if html is needed use safe and look at the antisamy-esapi.xml file to see policy details; in extreme trust cases use any where any html is allowed; note that many services need updating which should allow at least safe html, and it may take some time to discover all of those and get them handled; please send in issues and requests for service attributes that should allow safe html
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742352 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 09:34:34 +00:00
Hans Bakker
d4afd2a5bb
add the optional parameters 'distinct' and 'fieldList' to the performFind service
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742328 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 08:36:08 +00:00
Hans Bakker
79b5011d48
some fault fixing and added check on ownership to portalPage services.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742251 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 04:30:53 +00:00
David E. Jones
9075027988
Some cleanups, no functional changes
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742238 13f79535-47bb-0310-9956-ffa450edef68
2009-02-09 03:16:02 +00:00
David E. Jones
a0d0a10ebc
Resolved some more problems with the general html encoding, most of which are from funny code that should be cleaned up anyway so haven't run into any dilemmas so far; still looking though so could happen
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742053 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 11:08:32 +00:00
David E. Jones
c62ba66bf2
Fixed issue where controller.xml was not reloading based on cache clear or timeout
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742035 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 09:47:46 +00:00
David E. Jones
3d122767ba
Fixed issue with links in footer caused by change to general html encoding in ftl files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742034 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 09:40:32 +00:00
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
Hans Bakker
08ba67420f
cleanup of the portal pages, reduced number of screens, changed employee myportal, new user without securitygroups now also have his portal page with a profile portlet. only thing is missing is the usage of the sequence number in the portal page and portalpageportlet entity, probably completed next week
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742018 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 08:33:36 +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
Jacopo Cappellato
153ec0eba1
Misc enhancements to the update password screen and events: improved layout, error handling.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@742015 13f79535-47bb-0310-9956-ffa450edef68
2009-02-08 08:14:58 +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
Scott Gray
078a08692b
Fix NPE reported by Sneha Chaturvedi on the user mailing list
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741974 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 22:18:04 +00:00
Jacques Le Roux
8224468123
On Scott's suggestion on dev ML
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741964 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 21:23:51 +00:00
Jacques Le Roux
b2e544ef31
Fix a cut/paste typo
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741900 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 14:18:52 +00:00
Jacopo Cappellato
ceacb9a1bd
Fixed bug reported by deepak dixit in OFBIZ-2173: setting a blank password could messed up things.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741886 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 12:28:48 +00:00
Hans Bakker
a588477be4
add screenlets to manageportal pages, add descriptions
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741861 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 09:03:49 +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
Jacopo Cappellato
6f152e26ef
Improved create-admin-user-login target.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741855 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 08:43:39 +00:00
David E. Jones
375c48a1c5
Changed for new runEvent method signature, fixes compiler error
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741846 13f79535-47bb-0310-9956-ffa450edef68
2009-02-07 06:33:05 +00:00