David E. Jones
e71fe34443
Added quick first pass for the sendMailFromTemplateSetting service that uses the new EmailTemplateSetting entity; note that this is still beta as I haven't tested it much, but it shows that concept and can be a basis for further work, possibly including refactor of ProductStoreEmailSetting to use this entity and service but that isn't necessary for other things to use it, etc
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744736 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 19:57:43 +00:00
David E. Jones
f27b4eeaaa
No functional changes, just reorganizing code: moved email services from content to the framework/common component except the CommunicationEvent related ones which are now in the party component along with other CommunicationEvent resources; changed framework components so that webapp no longer depends on common and common is higher level than the various tool components which was an odd dependency before; one new thing is in here and that is an entity called EmailTemplateSetting which is meant to be a generic version of the ProductStoreEmailSetting entity so we can have configurable email templates without depending on ProductStore, still need to write the service to send email from this (sendMailFromTemplateSetting)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744727 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 19:34:49 +00:00
Hans Bakker
b27e4791b1
small corrections on last commit
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744679 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 15:36:59 +00:00
Hans Bakker
f43d2f1ecf
improved menu widget for portal pages, reactivated menuitem override and various other improvements
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744675 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 15:10:50 +00:00
Jacques Le Roux
56ce285fc5
This enforces probability
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744657 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 11:48:36 +00:00
Jacques Le Roux
4eacbb164a
This allows to use Windows paths from input fields (like from Entity import for instance)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744652 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 10:53:16 +00:00
Jacques Le Roux
d5dc2d53ab
Marco's LabelReferences2.patch from "New tool to get labels information" https://issues.apache.org/jira/browse/OFBIZ-2070 - OFBIZ-2070
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744635 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 08:42:06 +00:00
David E. Jones
b159af592c
A number of cleanups for double encoding, encoding that is not wanted (like for surveys, 2 places used toString() and others didn't so were fine), using always there nowTimestamp
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744574 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 21:52:16 +00:00
David E. Jones
11bc29b4a6
Changed these back to have LoginWorker.makeLoginUrl return a StringWrapper so it doesn't get encoded, and the @ofbizUrl and @ofbizContentUrl tags back to not decode because it is important that various encoded parameters remain encoded so the browser does not interpret the characters as part of the URL
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744573 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 21:50:43 +00:00
David E. Jones
b4c3b96da5
Fixed issue reported by Ashish Nagar where the condition was checking for the same character twice
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744420 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 08:23:13 +00:00
David E. Jones
1a5c2de3c5
Changed LoginWorker.makeLoginUrl back to returning a String and implemented a more general solution for the @ofbizUrl and @ofbizContentUrl tags so that they do decoding and are now tolerant of encoded URLs just in case it happens; this should be a more general fix and avoid the problem more; also a few cleanups like resolving warnings
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744418 13f79535-47bb-0310-9956-ffa450edef68
2009-02-14 08:17:05 +00:00
David E. Jones
f8351887b9
Changed LoginWorker.makeLoginUrl to return a StringWrapper so it does not get html encoded in FTL; decided to do it here instead of in each FTL file because based on a search it appears that this is ONLY used in FTL files
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744232 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 20:35:04 +00:00
David E. Jones
80b9e4e2cc
Changed LRUMap.get to be synchronized to hopefully resolve issue reported by Philippe Mouawad in Jira #OFBIZ-2186; comments in code discuss why this is needed; get is ONLY synchronized for the LRUMap, and not for caches where there is no size limit
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744205 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 18:25:50 +00:00
David E. Jones
ba3a806edf
Changed a couple of services to allow any html (ie not filter for HTML) as they are for incoming XML; related to issue #OFBIZ-2189
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744177 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 17:03:35 +00:00
Jacques Le Roux
469a538600
A enhanced patch from Arun Patidar "While Depressing Next/Previous link in webtools component, Records are not shown even if they are present there." https://issues.apache.org/jira/browse/OFBIZ-2184 - OFBIZ-2184
...
No need to encode, else double encoding since last changes, I changes all the occurences. I will see if there are other cases in *.groovy files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744085 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 11:31:08 +00:00
Jacques Le Roux
01cce258d5
This fix "Encoding issue in screenFop" https://issues.apache.org/jira/browse/OFBIZ-2183 - OFBIZ-2183
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744061 13f79535-47bb-0310-9956-ffa450edef68
2009-02-13 10:58:24 +00:00
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