Commit Graph
361 Commits
Author SHA1 Message Date
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
David E. Jones 89ba7ff311 Small change to groovy: stuff in FlexibleStringExpander to only interpret the expression/script on the initial parse and not each time it is run; tested with the stuff in the example component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763105 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 05:14:23 +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
Andrew Zeneski cc9b2baf9d Added Groovy support to the FlexibleStringExpander; updated example component to show usage
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@762610 13f79535-47bb-0310-9956-ffa450edef68
2009-04-07 03:17:31 +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 2ff381283b Securing URLs, link element in screens and menus : 30th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761977 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 18:08:08 +00:00
Jacques Le Roux 3efbbc81cd Securing URLs, link element in screens and menus : 29th set + tabs to 4 spaces
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761976 13f79535-47bb-0310-9956-ffa450edef68
2009-04-04 17:46:49 +00:00
Jacques Le Roux ef0137f95b Securing URLs, link element in screens and menus : 26th set + tabs to 4 spaces
We continue to approach the end... But for some exceptions, more than the 2 I found before. I will write a compilation on dev ML at end

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@761261 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 12:14:18 +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
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 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 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
Adam Heath 6c69bc963e Fix lines that *only* have whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@759235 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 16:57:05 +00:00
Hans Bakker cc860ba38b rather big change which contains the following:
1. created a new function in the partyManager called 'myCommunications'
This function enables the sending and receiving of email and internal communications to/from the current userlogin. It looks like an email client for internal and external email.
2. merged the party/webapp/partymgr/communication/CommMenus.xml and party/widget/partymgr/PartyMenus.xml
3. moved all forms/screens from my portal back into the party component
4. fixed some more problems with myportal
5. added 'save-home' and save 'current' in the same pattern as 'save-last' function in the controler.xml
6. added 'view-home' in the same pattern as 'view-last'
7. moved all related uilabels from myportal to party
8. This update needs a re-creation of the portlet/portal entities.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@758522 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 06:06:12 +00:00
David E. Jones 4a1705a315 Removed some more references to applications stuff from framework, including small cleanup of service engine to get rid of WebAppDispatcher and use new factory method in GenericDispatcher, and changed AvailableServices.groovy to get the real dispatcher list instead of a hard-coded one; also updated eclipse classpath file for new webslinger stuff
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757671 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 06:27:03 +00:00
Jacques Le Roux be11b911cb Better French translations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757274 13f79535-47bb-0310-9956-ffa450edef68
2009-03-22 23:16:48 +00:00
Jacques Le Roux 92e3dcfdb5 Some French translations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757271 13f79535-47bb-0310-9956-ffa450edef68
2009-03-22 22:44:52 +00:00
Jacques Le Roux cb9d5cb891 Some French translations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757169 13f79535-47bb-0310-9956-ffa450edef68
2009-03-22 11:01:48 +00:00
Adam Heath 882cec2f3d Fix purely empty whitespace lines, and remove trailing whitespace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@757082 13f79535-47bb-0310-9956-ffa450edef68
2009-03-21 23:25:28 +00:00
Hans Bakker 03e3014267 remove reference to non existing file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@756339 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 06:27:01 +00:00
Jacques Le Roux 3dd56b670a Marco's LabelsReferences8.patch : "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@755394 13f79535-47bb-0310-9956-ffa450edef68
2009-03-17 21:01:43 +00:00
Hans Bakker 1e1ed8fba9 move all examples from the common to the example component, edit parameters of portlet in the general managePortalPage screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@752401 13f79535-47bb-0310-9956-ffa450edef68
2009-03-11 08:05:34 +00:00
Bruno Busco a36cb4dd3e Changed WebSiteId parameter description to be more general
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@751214 13f79535-47bb-0310-9956-ffa450edef68
2009-03-07 07:19:07 +00:00
Hans Bakker d4137b9f46 add the possibility to list portlets by portlet category
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@746646 13f79535-47bb-0310-9956-ffa450edef68
2009-02-22 08:16:32 +00:00
Hans Bakker a8c6835b35 several small bug fixes in example, portalpages
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744838 13f79535-47bb-0310-9956-ffa450edef68
2009-02-16 07:40:28 +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
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 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
Jacopo Cappellato 1dd37d9873 Removed reference in comment to Jetty container.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741482 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 09:15:43 +00:00
Hans Bakker 9ea7eebcc0 make example dashboard working again with the recent portal page changes and removed fulladmin pages from myportal because not required
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741439 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 06:59:53 +00:00
David E. Jones 7fdd5220cf Moved Help link from tab bar to the link section below it as the Help page was NOT a tab, or in other words by clicking on it you go to a screen outside fo the tab set and the tabs disappear
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741381 13f79535-47bb-0310-9956-ffa450edef68
2009-02-06 02:32:10 +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
Jacopo Cappellato 358b545a97 Fix to avoid the test to fail after recent change to "system" seed data.
By the way: is it correct to have a test rely on demo data like this one?


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@741119 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 15:01:34 +00:00
Jacques Le Roux 5abb9596cb LabelsInfo14.patch from Marco "New tool to get labels information" (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070
+ some correct changes done with this update of Labels Manager (I updated some wrong ones by hand to keep going forward...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739955 13f79535-47bb-0310-9956-ffa450edef68
2009-02-02 10:17:34 +00:00
Jacques Le Roux 2eeaa25b8d <if-compare field-name= => <if-compare field=
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739769 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 14:13:19 +00:00
Jacopo Cappellato 98e71f1922 Misc cleanups for data files:
1) added {SHA} prefix to all hashed passwords
2) moved "admin" user to demo data; the only user maintained with seed data is now the "system" user
3) removed password for the "system" user; now there are no passwords in seed data



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739743 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 11:40:55 +00:00
Jacques Le Roux 290534059d <entity-one entity-name=(.*)value-name => <entity-one entity-name=$1value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739732 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 10:27:43 +00:00
Bruno Busco c4d9922812 Removed Login and Logout menu item from FTL based app-navigation menus. (Moved now to the header).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739724 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 09:58:36 +00:00
Jacques Le Roux 81fd022764 LabelsInfo15.patch from (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@739720 13f79535-47bb-0310-9956-ffa450edef68
2009-02-01 09:21:32 +00:00
Jacques Le Roux b00283d857 A patch from Bruno Busco "Drop-down Applications Bar" '(https://issues.apache.org/jira/browse/OFBIZ-2118) - OFBIZ-2118
Fix an issue in Example component



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737505 13f79535-47bb-0310-9956-ffa450edef68
2009-01-25 11:44:46 +00:00
Jacques Le Roux be52ca66b2 These 2 lines are to be dropped later
<!-- tooltip="Same as above, uses the ${'${'bsh:...} notation to call an util method to get the now timestamp}"-->
            <!-- tooltip="Same as above, uses the \${bsh:...} notation to call an util method to get the now timestamp}"-->
Maybe even all the block about this bsh syntax should be dropped anyway... (but can still be used, so maybe better to keep it ?)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737329 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 10:57:45 +00:00
Jacques Le Roux fceaeb561a I think we have an issue in UEL when it comes to escape UEL expressions in literals.
I tried what is documented in the PDF here http://docs.ofbiz.org/download/attachments/6430/UEL.pdf, but no way.
<<To generate literal values that include the character sequence "${" or “#{“, the developer can choose to use a composite expression as shown here:
${'${'}exprA}
#{'#{'}exprB}The resulting values would then be the strings ${exprA} and #{exprB}.
Alternatively, the escape characters \$ and \# can be used to escape what would otherwise be treated as an eval-expression. Given the literal-expressions:
\${exprA}
\#{exprB}
The resulting values would again be the strings ${exprA} and #{exprB}.>>
Or maybe I'm missing something ? (Anyway it's a weird case ;o)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737328 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 10:56:00 +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
Jacques Le Roux 322169e32f French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@735438 13f79535-47bb-0310-9956-ffa450edef68
2009-01-18 11:26:32 +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
Hans Bakker ff7759b530 show the component name at the login screen for all components
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@734074 13f79535-47bb-0310-9956-ffa450edef68
2009-01-13 08:47:35 +00:00