Commit Graph
1620 Commits
Author SHA1 Message Date
Jacques Le Roux aaa94de2cd last component:// in controllers missing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767125 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 12:30:36 +00:00
Jacopo Cappellato 7bdaf0f538 Reverted change I did in rev. 766704: restored the original syntax after Andrian enhanced the UEL connector to support it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@767012 13f79535-47bb-0310-9956-ffa450edef68
2009-04-21 06:39:34 +00:00
Jacopo Cappellato 7d95b223fb Fixed code that was not working (I think) after recent implementation of UEL.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766704 13f79535-47bb-0310-9956-ffa450edef68
2009-04-20 14:19:28 +00:00
David E. Jones 70f8da92bb Moved logo and icon images back to images component and removed from everywhere else; all references to these should be to there only now; fixes issue with logo in ecommerce and other little things
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@766426 13f79535-47bb-0310-9956-ffa450edef68
2009-04-19 06:12:55 +00:00
Adrian Crum 9a753b9865 Fixed a problem where service definitions were using "GenericValue" as attribute types, but that threw exceptions because the service definitions needed the full class name - "org.ofbiz.entity.GenericValue". The problem was reported in https://issues.apache.org/jira/browse/OFBIZ-2268 and https://issues.apache.org/jira/browse/OFBIZ-2311.
I checked the commit logs and I don't see what changed to cause these services to stop working, so I took the shotgun approach and changed all occurrences of GenericValue service attributes.

If anyone has a better solution, please feel free to revert this commit and change it.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765864 13f79535-47bb-0310-9956-ffa450edef68
2009-04-17 06:33:43 +00:00
Scott Gray 7531687fdd OFBIZ-2259: Implemented test data rollback per test-suite using the GenericDelegator
Provides the following benefits:
1. Test data independence per component suite
2. Ability to run tests repeatedly without reloading the database
3. Continued database independence for the testing tools
4. The possibility of future improvements for controlling when data is rolled back (per unit test, group of unit tests within a suite or
even tree structured tests where data is partially rolled back before continuing)
5. The future possibility to export data changes resulting from a test run
6. The future possibility to verify a test result automatically based on the output of #4

The rollback currently doesn't catch changes resulting from async service calls and also doesn't rollback changes to SequenceValueItem

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@765057 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 06:01:36 +00:00
Vikas Mayur c317415793 Changed the alt attribute of <img> tag to use label instead of free form string to support i18n stuff for all the lookup screens.
Patch from Divesh, Part of OFBIZ-2276 (https://issues.apache.org/jira/browse/OFBIZ-2276).
I have also changed alt="Lookup" with the label.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764753 13f79535-47bb-0310-9956-ffa450edef68
2009-04-14 12:08:55 +00:00
Jacques Le Roux 999bd7c577 Fix following Chris Howe's message in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764195 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 13:00:24 +00:00
Jacques Le Roux af5b099668 Cleaning my "clean instance" I (finally) found (only) this (a trailing space)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764188 13f79535-47bb-0310-9956-ffa450edef68
2009-04-11 09:41:11 +00:00
Jacques Le Roux 3c94bec42b I finally reverted almost all Ashish Nagar's patch from https://issues.apache.org/jira/browse/OFBIZ-2260 - OFBIZ-2260 that I commited after a review but no tests in r762149.
This because these URLs in FTL file were not calling services, hence, as explained David, did not need any changes
I kept only changes I found by chances (because I got conflicts in them) in 
specialpurpose\ecommerce\webapp\ecommerce\order\orderitems.ftl
specialpurpose\ecommerce\webapp\ecommerce\order\orderheader.ftl
applications/order/webapp/ordermgr/order/ordershippinginfo.ftl 
I also added one secured URLs - createShipment2 - in this last file and there are more to do just below : quickDropShipOrder, createShipment. I think we need more than good will and chance here. We need to define a strategy to spot the URLs calling services in ftl files. This does not sound like impossible to automatize and I firmly think we should do that before freezing R9.04


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764077 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 22:09:23 +00:00
David E. Jones 298fbb94ef Fixed issue with data loading I caused when moving this record from the ecommerce component to the order component; reported on the ml by gil portenseigne
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764074 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 22:03:14 +00:00
Jacques Le Roux 39c91eefe3 Reverted all changes done in r762149 since these were not for services calls
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@764066 13f79535-47bb-0310-9956-ffa450edef68
2009-04-10 21:36:41 +00:00
David E. Jones bc073306e7 Added/moved some missing WebSite data needed for selecting themes, etc
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763828 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 22:12:11 +00:00
Vikas Mayur 7f3b4ef5f9 Fix the padding on returnItemSeqId field when a return is created.
Applied a slightly modified patch from OFBIZ-2281 (https://issues.apache.org/jira/browse/OFBIZ-2281).
Thanks Divesh Dutta for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763582 13f79535-47bb-0310-9956-ffa450edef68
2009-04-09 09:56:56 +00:00
Andrew Zeneski 64b3a8bf99 changed package name to match the component; also previous package name was not all lower case creating a new package when viewing in webtools
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763356 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 19:23:18 +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
Hans Bakker c1491066f0 moved custrequest notification from myportal to order,moved other programs around, reorganized customer request status handling, replaced cust request roles from ftl to form, removed other used programs from myportal. Now only the party registration is left in myportal.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763135 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 07:58:00 +00:00
Jacques Le Roux a5042291f7 1st part of an effort to remove trailing spaces
" +/> => "/>
Should be easier when dealing with Eclipse S/R regexp

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762648 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 08:27:15 +00:00
Jacques Le Roux 2205720dc2 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762502 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 20:53:23 +00:00
Bilgin Ismet Ibryam 85ce1cffbc Fixed a bug reported by CJay Harton in user ML, that caused new product creation for the same aggregated product configuration.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762248 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 08:12:03 +00:00
Hans Bakker 897e5b96f1 delete mypage component,moved some labels, myportal is a good replacement
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762245 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 07:53:25 +00:00
Jacques Le Roux 76f5ca6638 Secure URLs, we don't need to duplicate in from-field when param-name is the same
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762215 13f79535-47bb-0310-9956-ffa450edef68
2009-04-06 06:25:24 +00:00
Jacques Le Roux 61a5c1dcf4 A modified patch from Ashish Nagar "Secure URLs in Freemarker templates files" https://issues.apache.org/jira/browse/OFBIZ-2260
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762149 13f79535-47bb-0310-9956-ffa450edef68
2009-04-05 20:16:46 +00:00
Jacques Le Roux 9fe85c7878 Securing URLs, link element in screens and menus : 32th set + tabs to 4 spaces
Begin to end with non regular formattings

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762010 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 21:06:20 +00:00
Jacques Le Roux c2ed8b71ac Securing URLs, link element in screens and menus : 27th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761971 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 17:33:50 +00:00
Hans Bakker bdf0787a93 move request menu into general ordermenu, only show createquote from request if the quote type is ok
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761537 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 06:38:10 +00:00
Hans Bakker 4972eb7aa0 make editcontactmech within employee profile working in HR again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761529 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 05:33:14 +00:00
Jacques Le Roux 76352e305a Securing URLs, link element in screens and menus : 24th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761238 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 10:27:18 +00:00
Bilgin Ismet Ibryam 7e7c1f375a Added an optional "name" attribute to event element in controller.xml This attribute is used only (also required) in events inside
firstvisit, after-login, before-logout, preprocessor and postprocessor elements. Events with same name will be overridden and only the last one will be executed. Overriding works also in cases when a controller.xml includes other controller files.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761220 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 09:47:48 +00:00
Jacques Le Roux e8426631e8 Securing URLs, link element in screens and menus : 22th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761214 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 09:14:40 +00:00
Hans Bakker cbbe02a1d8 many cleanups, moved customer requests back into order, fixed the edit contactmech in portal as reported in the mailing list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761186 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 06:57:09 +00:00
Jacques Le Roux c2ee60cb8e Securing URLs, link element in screens and menus : 14th set + tabs to 4 spaces
+ fix a bug introduced in ProjectScreens.xml in previous commit (workEffortTypeId was missing)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760973 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 17:28:03 +00:00
Jacques Le Roux ca876f93ce Securing URLs, link element in screens and menus : 11th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760789 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 06:16:07 +00:00
Jacques Le Roux 2ae583d0a1 Securing URLs, link element in screens and menus : 10th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760787 13f79535-47bb-0310-9956-ffa450edef68
2009-04-01 05:50:07 +00:00
Jacques Le Roux 85de0c1d3a Securing URLs, link element in screens and menus : 3rd set
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760586 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 20:20:29 +00:00
Jacques Le Roux 6868719669 Useless as explained by David on dev ML (intra-app). Moreover there were full of typos :/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@760409 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 11:52:21 +00:00
Jacques Le Roux 77a2ff1d9f 21th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements

We are near the end...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759684 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:02:55 +00:00
Jacques Le Roux 40f5281303 20th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759680 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 13:33:53 +00:00
Hans Bakker 2d047ff733 move incoming cust request back from myportal into order and update party portlet descriptions and portlet categories
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759674 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 12:56:50 +00:00
Jacques Le Roux 8c6d89fe75 18th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements

This one is huge, with some changes by hand, conversion from tabs to 4 spaces and some trailing spaces (I have activated it AnyEdit plugin following the changes I made in http://docs.ofbiz.org/display/OFBADMIN/Coding+Conventions but I wonder if I should not reverse all that - I mean my plugin setting and in wiki -, it's a nightmare!)

I did my best on this one, but I'm not sure some typos did not slip in. Anyway, alea jacta est


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759666 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 11:00:00 +00:00
Jacques Le Roux c97ffabfa5 17th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759654 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 09:04:49 +00:00
Jacques Le Roux 3fe66ef254 tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759574 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 20:13:03 +00:00
Jacques Le Roux 0a55248195 14th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759565 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 20:01:04 +00:00
Jacques Le Roux 2f9c37bd22 13th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759564 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 19:56:49 +00:00
Jacques Le Roux e3f730799b 12th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759562 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 19:45:05 +00:00
Jacques Le Roux efd4862041 10th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
Some hyperlink tag are still not well indented (3 spaces instead of 4), I gave up :/



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759515 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 17:36:08 +00:00
Jacques Le Roux 10a5ee651a Replace tabs by 4 spaces in previous commit. I used 4 spaces instead of 2 because this was already used in this files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759496 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 16:16:29 +00:00
Jacques Le Roux a30c0c9f3e 8th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759495 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 16:14:58 +00:00
Jacques Le Roux 6936c24e22 6th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759481 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 15:12:54 +00:00
Jacques Le Roux 4106babe54 Forgot to replace tabs by 4 spaces in previous commit. I used 4 spaces instead of 2 because this was already used in this files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759468 13f79535-47bb-0310-9956-ffa450edef68
2009-03-28 14:25:39 +00:00