Commit Graph
185 Commits
Author SHA1 Message Date
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
David E. Jones c9e848d99e Cleanups for new more consistent attribute names; changed AddExampleFeatureAppl form to use the newly possible combination of ajax autocomplete and lookup box, good for when user has no clue what the ID might be
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@733489 13f79535-47bb-0310-9956-ffa450edef68
2009-01-11 16:39:33 +00:00
Jacques Le Roux 66ffa47fd6 This does not hurt and help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@732677 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 10:36:01 +00:00
Hans Bakker 299572ab6a updates according the comments from bruno
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731508 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 09:48:15 +00:00
Jacques Le Roux 84124c1f43 Some labels fixes
+ a not toally applied patch from Erik Wegner " More German translations" see https://issues.apache.org/jira/browse/OFBIZ-2067?focusedCommentId=12660475#action_12660475 - OFBIZ-2067


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731224 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 11:57:53 +00:00
Hans Bakker ab68f24611 some small corrections in myportal framework and the first batch of updates for myportal
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730947 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 09:48:18 +00:00
Hans Bakker af2fa0115a major cleanup of of the portalpages, files split between display and configure, user can now create/update a copy of the system pages and revert back, example component working now....next week we will do the portal component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730665 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 03:35:41 +00:00
Jacques Le Roux 94225b1a34 Fix issues with now-timestamp-to-env and sequence-id-to-env : their factories names where missing in org.ofbiz.minilang.method.MethodOperation$Factory file
also
<sequenced-id-to-env(.*)env-name => <sequenced-id$1field
<now-timestamp-to-env(.*)env-name => <now-timestamp$1field
both on *SimpleMethods*.xml, *events*.xml, *formula*.xml, *services*.xml, *tests*.xml (previously I only used *events*.xml, *services*.xml, but I guess it's not a big deal for now)




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730433 13f79535-47bb-0310-9956-ffa450edef68
2008-12-31 17:47:37 +00:00
Jacques Le Roux 0272162a99 revert both
sequenced-id(.*)field to <sequenced-id-to-env$1env-name
<now-timestamp(.*)field => <now-timestamp-to-env$1env-name
Something is wrong with these 2 tags (inconsistency between xsd and java, I'll look at it)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730397 13f79535-47bb-0310-9956-ffa450edef68
2008-12-31 13:59:08 +00:00
Jacques Le Roux 25f83d6d12 <property-to-field(.*)field-name => <property-to-field$1field
<store-value value-name => <store-value value-field ... Weird : I have already done this one in r730190 !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730369 13f79535-47bb-0310-9956-ffa450edef68
2008-12-31 10:40:29 +00:00
Jacques Le Roux dbc4228779 <now-timestamp-to-env env-name => <now-timestamp field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730194 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 17:25:18 +00:00
Jacques Le Roux 1d979ede39 <store-value value-name = > <store-value value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730190 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 17:20:41 +00:00
Jacques Le Roux bbedb431c2 <get-related(.*)value-name => <get-related$1value-field
<get-related(.*)list-name => <get-related$1list
<get-related(.*)\R(.*)list-name => <get-related$1\R$2list-name
<get-related(.*)\R(.*)value-name => <get-related$1\R$2value-field
<calculate field-name => <calculate field
<calcop(.*)field-name => <calcop$1field
<result-to-field(.*)field-name => <result-to-field(.*)field
<result-to-field(.*)field="(.*)"(.*) map-name="(.*)" => <result-to-field$1field="$4.$2"$3
<field-to-request field-name => <field-to-request field

(I had a connection break that's while I put all of them in one sole commit)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730183 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 17:12:15 +00:00
Jacques Le Roux 38456812e0 <field-to-result(.*)field-name => <field-to-result$1field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730116 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 12:14:23 +00:00
Jacques Le Roux e2bbdc2d40 <entity-and(.*)list-name => <entity-and$1list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730114 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 12:11:33 +00:00
Jacques Le Roux e01e175266 <entity-one(.*)value-name => <entity-one$1value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730111 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 12:07:14 +00:00
Jacques Le Roux e25c1d9c67 <create-value(.*)value-name => <create-value$1value-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730108 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 12:01:09 +00:00
Jacques Le Roux 4ed4fcf8b9 same but with non
<set-pk-fields(.*)map-name => <set-pk-fields$1map
<set-pk-fields(.*)value-name => <set-pk-fields$1value-field
I was not very clever on this one ;)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730107 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:59:10 +00:00
Jacques Le Roux ec8447c72a <set-pk-fields(.*)map-name => <set-pk-fields$1map
<set-pk-fields(.*)value-name => <set-pk-fields$1value-field

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730104 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:55:26 +00:00
Jacques Le Roux 5e38ebc0ea <make-value(.*)value-name => <make-value$1value-field
r730090 was naive fix also <iterate list-name and entry-name to <iterate list and entry

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730098 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:28:24 +00:00
Jacques Le Roux 87c67bc088 <first-from-list(.*)list-name => <first-from-list$1list
and
<first-from-list(.*)entry-name => <first-from-list$1entry


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730096 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:17:32 +00:00
Jacques Le Roux 55a4536933 <field-map(.*)env-name => <field-map$1from-field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@730092 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 11:11:15 +00:00
Hans Bakker 3eaa5e80f2 have the ability to modify system pages (ownerLogin=_NA_) by copying to own number and modify there...now also available in the example component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728634 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 09:51:29 +00:00
Hans Bakker 63c50ecec4 First version of the myportal component as a replacement of the MyPage component as announced in issue OFBIZ-2052 now using the new portal functions. Introduced with this version is that the system pages (userLogin=_NA_) are never changed, but automatically a new page is created for the logged in user when he modifies the system page. The deletion function now returns to the system page design
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728389 13f79535-47bb-0310-9956-ffa450edef68
2008-12-21 04:40:27 +00:00
Jacques Le Roux a1efddafbe Some i18n and French l10n
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728288 13f79535-47bb-0310-9956-ffa450edef68
2008-12-20 15:08:03 +00:00
Jacques Le Roux 978a1bbe63 A patch from Bruno Busco "Error in DashBoardExample" '(https://issues.apache.org/jira/browse/OFBIZ-2096) - OFBIZ-2096
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728251 13f79535-47bb-0310-9956-ffa450edef68
2008-12-20 08:44:43 +00:00
Jacques Le Roux 957f67f3cd Fixed one
value="${bsh: org.ofbiz.base.util.UtilDateTime.nowTimestamp()}"
replacing by 
    value="${date:nowTimestamp()}"
    
I let the other for now (it's easy to fix in all OFBiz by replacing the one by the other) for an live example to Adrian who is currently working on JUEL
    

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@728135 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 20:29:14 +00:00