Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux b69d17ff5b Wooo, even better one :o)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1025515 13f79535-47bb-0310-9956-ffa450edef68
2010-10-20 11:50:07 +00:00
Jacques Le Roux 0d05664e3c Better French comment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1025513 13f79535-47bb-0310-9956-ffa450edef68
2010-10-20 11:48:57 +00:00
Jacques Le Roux fc67cd973a Update download-PG-JDBC to Postgres 9
http://jdbc.postgresql.org/download.html#current

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1024186 13f79535-47bb-0310-9956-ffa450edef68
2010-10-19 09:28:32 +00:00
Bruno Busco 2885df1a2b Moved/Merged portalPage related labels from MyPortal to Common.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023458 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 11:11:52 +00:00
Bruno Busco e06bb8f36a Slightly improved example portlets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023451 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 10:37:58 +00:00
Bruno Busco 4f1d234a85 ManagePortalPages screen improvements.
The PortalPage list is now collapsible. The form to create a new portalPage has been moved to a dedicated screen.
This allows to have a less crowded screen and the portalPage being configured can be seen almost at full screen.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023447 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 09:46:52 +00:00
Bruno Busco 8c89d58f9a Removed uiLabelDecorators. This is a pattern that should not be used. It does not really help but creates dependences instead.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023430 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 07:42:36 +00:00
Bruno Busco c7b53b7ae4 Removed unused showPortletUiLabelDecorator.
Generally xxxxUiLabelDecorator should not be used. Having a decorator that only adds UiLabel resources creates unnecessary screen dependences.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023429 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 07:33:35 +00:00
Bruno Busco 6d1f3fe479 Removed PortalPageScreen and showPortalPage.ftl since they have been replaced by include-portal-page widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023428 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 07:24:40 +00:00
Bruno Busco 599547f6b5 The retrievePortletAttributes.groovy is not needed any more since it is now embedded in the include-portal-page widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023427 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 07:22:16 +00:00
Bruno Busco 9e6dd1f56c Replaced PortalPageScreen with the new include-portal-page widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023425 13f79535-47bb-0310-9956-ffa450edef68
2010-10-17 06:44:14 +00:00
Bruno Busco f365825491 Replaced permission PORTALPAGE_MAINT with PORTALPAGE_ADMIN
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023344 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 18:22:43 +00:00
Bruno Busco d4f513d060 Removed include-portal-page widget example. Not really needed any more.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023342 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 18:12:11 +00:00
Bruno Busco fa6f935650 Removed service "updatePortalPagePortletSeq". This is not used any more.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023341 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 18:08:17 +00:00
Bruno Busco 6b64d8f840 Removed unused file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023287 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 14:07:01 +00:00
Bruno Busco 53213d0f3e Used include-portal-page widget in ShowPortalPage Screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023286 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 14:02:47 +00:00
Bruno Busco bc9f49bf3f Used include-portal-page widget in Portal Admin Screen.
Removed editPortalPage.ftl not needed any more.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023285 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 14:01:19 +00:00
Bruno Busco b6db13d60a Added a back button to the screens used to select a portlet to be added, to change the column width and to edit portlet attributes.
The back button can be used to abort the operation.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023244 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 11:06:34 +00:00
Bruno Busco 9e28021903 Typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023209 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 08:35:53 +00:00
Bruno Busco f098b68cb3 Introduced the new include-portal-page in the ManagePortalPages screen.
This should be the only change that needs to be reverted if any issue with the new include-portal-page is raised.
I do not proceed further with the widget introduction into other screens for a while (even if I have a local copy of the whole OFBiz converted) so that it will be tested more.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023206 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 08:04:58 +00:00
Bruno Busco bb966c359b Added new request "updatePortletSeqDragDrop" in portal-controller.
This allows to move the portlet rendered using the include-portal-page widget using the same service used for the portlet drag and drop.
Redundant moving services will be removed when the include-portal-page widget will have completely established.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023203 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 07:43:45 +00:00
Bruno Busco e34baf6c08 Added new PORTALPAGE_ADMIN permission (this will replace the existing PORTALPAGE_MAINT in next commits)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023202 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 07:40:21 +00:00
Bruno Busco 79d86ffa14 Improved include-portal-page widget.
- Changed edit-mode attribute to conf-mode
- Added a use-private attribute. This is "true" by default but can be set to "fasle" if the include-portal-page must render a specific PortalPage without checking if a derived private PortalPage copy exists (i.e. in PortalPageAdmin screens)
- Fixed Portlet attributes retrieval. After each portlet rendering the attributes are removed from the context so that another instance of the same portlet in the same PortalPage that has no attribute value specified falls back to default values and not to the values of the previous portlet.
- The up/down/left/right portlet icons use the same service used for the Portlet Drag and Drop. (This is not working yet. Needs a next commit)
- Few portlet style and labels updates


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023197 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 06:58:25 +00:00
Bruno Busco 00f98b9644 Remove unused ListPortalPage.groovy. This has been replaced by the PortalPageWorker.getPortalPages method
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023195 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 06:03:41 +00:00
Bruno Busco 4e2f5f67ba - Moved method getPortalPages from ModelMenuItem to the PortalPageWorker. This is a method that generally retrieves all PortalPages that have a common parent. It will be re-used in a next commit.
- Added method to the PortalPageWorker to retrieve a PortalPage considering if a private derived copy exists for the current user (will be used in a next commit)
- Added method to the PortalPageWorker to check if the current user is allowed to configure a PortalPage.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023194 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 06:01:16 +00:00
Bruno Busco 4e6526182f - No need to calculate sequenceNumMin and sequenceNumMax. Native form widget itemIndex and listSize can do the job.
- Disabled form pagination. We want all PortalPages in one list to set their ordering.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1023191 13f79535-47bb-0310-9956-ffa450edef68
2010-10-16 05:53:26 +00:00
Bruno Busco 16388ee23a Commented lookup reference to "LookupUserLoginAndPartyDetails" in the EditPortalPage form.
This lookup was not present (in the same file) and caused an exception whenever the form was showed.
I did not change it to reference to the LookupUserLoginAndPartyDetails in the Party component because this would add a framework dependence from Party.
If we decide to put a part of the Party component in the framework the lookup can be used again.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1022725 13f79535-47bb-0310-9956-ffa450edef68
2010-10-14 21:26:40 +00:00
Bruno Busco 248b36e380 Removed sort-field option in ManagePortalPage portals list.
This caused the form header accept column sorting commands but was not really working.
The PortalPages order in this list is controlled using the ordering arrows and is associated to the PortalPage MenuItems order.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1022709 13f79535-47bb-0310-9956-ffa450edef68
2010-10-14 21:02:57 +00:00
Bruno Busco 94d22886eb Removed the creation of the first PortalPageColumn when creating a new PortalPage. A PortalPage is now created without any column.
The first column creation caused that when the user derives a private PortalPage from a system PortalPage this is created with an extra empty column.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1022705 13f79535-47bb-0310-9956-ffa450edef68
2010-10-14 20:57:10 +00:00
Bruno Busco 4d6e815b0f Removed unused method getPortletAttributes. It seems this has been replaced by the getPortletAttributes service located in PortalPageServices.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1022702 13f79535-47bb-0310-9956-ffa450edef68
2010-10-14 20:50:04 +00:00
Hans Bakker c3f42f6e0b correction on commit 1022409
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1022412 13f79535-47bb-0310-9956-ffa450edef68
2010-10-14 08:24:16 +00:00
Hans Bakker 4fa8c6436a correction on commit 1000753 attachment name list is optional making send invoice fail
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1022409 13f79535-47bb-0310-9956-ffa450edef68
2010-10-14 08:04:48 +00:00
Jacques Le Roux 1610fce6df A patch from Sascah Rodekamp "Server Hit Bin, counterHit receive delegator" (https://issues.apache.org/jira/browse/https://issues.apache.org/jira/browse/OFBIZ-3984) - OFBIZ-3984
Patch to improve the delegator call in the countHit method.
The method got the delegator name from the session and got, with this delegator name over the delegator factory, the delegator.
But when the delegator name was not available in the session the method crashes.
I try to get the delegator from the request, and if their is no delegator object I go the factory way.

I think it's a little bit saver to get a delegator object this way

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1021344 13f79535-47bb-0310-9956-ffa450edef68
2010-10-11 13:43:38 +00:00
Erwan de Ferrieres 2b0bf1c8cc Avoiding error when trying to edit a portalPage with no portlets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005875 13f79535-47bb-0310-9956-ffa450edef68
2010-10-08 16:01:42 +00:00
Jacques Le Roux 7a9a644f08 New Price Rules screen.
I tried to make it look better by having only one Value column but I found that a field inserted by Prototype was not taken into account when submitted. As it's not possible to rename a DOM element I finally gave up and used use-when + hide/show instead. I will see if we can do better with jQuery...
I kept the old Screen + Groovy + FTL files, not for nostalgics, but in case someone has to quickly deal with fields with a lot of values (to avoid drop-down saturation). Then the Id will still be used. Note that it's also possible to do so with the new screen: you need only to put the field type in setPriceRulesCondEventJs.ftl and at top of getAssociatedPriceRulesConds service implementation in order to handle it as an Id with an input field (like it's done OOTB for Quantity and List Price)

I'd like to use the same mechanism for Promo Rules. I will do that later, hopefully before merging jQuery...

BTW, I like the now clear separation with Ajax onComplete event.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005861 13f79535-47bb-0310-9956-ffa450edef68
2010-10-08 15:33:03 +00:00
Adam Heath f6dc585134 Fix checking of combined schema.tableName; the schema needed to be
normalized.  This fixes oracle at startup, so that it doesn't wrongly
thing that no tables are defined in the database.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005628 13f79535-47bb-0310-9956-ffa450edef68
2010-10-07 20:46:45 +00:00
Adam Heath d0850f76d5 fix getSchemaName, to change the case of the defined schema, based on
the database metadata settings.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005627 13f79535-47bb-0310-9956-ffa450edef68
2010-10-07 20:46:39 +00:00
Adam Heath 1bfa9fffdb In getColumnInfo, getReferenceInfo, and getIndexInfo, replace all the
blocks that fetched the scheme name with the helper method
getSchemaName.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005626 13f79535-47bb-0310-9956-ffa450edef68
2010-10-07 20:46:33 +00:00
Adam Heath 0191592447 Optimize checkDb() call, to not continually recalculate the tableName.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005625 13f79535-47bb-0310-9956-ffa450edef68
2010-10-07 20:46:28 +00:00
Adam Heath 2f8aa04d7c Fix updateByCondition, it was converting the condition to sql without
passing any of the values thru the prepared statement; this meant that
toString() was being called, instead of the correct setFoo method.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005624 13f79535-47bb-0310-9956-ffa450edef68
2010-10-07 20:46:22 +00:00
Adam Heath 5b99ca0b75 Replace 2 cases of string addition with StringBuilder.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005622 13f79535-47bb-0310-9956-ffa450edef68
2010-10-07 20:46:17 +00:00
Jacques Le Roux be27d50635 Clarifies, improves and generalize getDependentDropdownValues.js.
* Now it's possible to also hide the drop-down field title
* Clarify the inputField usage (now a boolean)
* Allows to use allow-empty="true" on main field (of course dependent field as well if needed). For that onComplete is used and generalizes
* longer Fade duration (from 1.5 to 2.5) to let enough time to read...

An example of hide+hideField use with setCountryStatesEventJs.ftl.
I should "soon" commit the new Price Rules screen which uses the inputField parameter for the Quantity condition

Any functional changes as setCountryStatesEventJs.ftl and the getDependentDropdownValues optional parameters are not used OOTB


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1005395 13f79535-47bb-0310-9956-ffa450edef68
2010-10-07 10:16:46 +00:00
Erwan de Ferrieres be976edc82 missing data for French overseas departments
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1004408 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 20:33:25 +00:00
Erwan de Ferrieres 4de902af7a title was missing in renderDisplayField macro
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1004391 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 20:17:06 +00:00
David E. Jones 8c6f5defdf Added error message for when entity name is wrong instead of an NPE
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1004343 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 18:05:26 +00:00
Jacques Le Roux e7bdf3d27e This comment is not true anymore (you can set things using POP/IMAP transfer menu option in your GMail account).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1004238 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 13:54:25 +00:00
Jacques Le Roux ad6c8a8341 Deprecates renderTemplateFromString from Scott's remark on dev ML.
I also removed a wrong @Override annotation for OFBizTemplateExceptionHandler

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1004148 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 08:55:13 +00:00
Jacques Le Roux 8372d0cf87 A patch from Sascha Rodekamp "Additional parameter for FreeMarker to tell if it should load ftl files from cache or not" (https://issues.apache.org/jira/browse/OFBIZ-3970) - OFBIZ-3970
This patch allows you to tell FreeMarker if it should load the ftl files from cache or not as extension for the method description. If you have a few screens which shouldn't use the cache you can configure them separately. The use case is loading content with templates which are stored in the DB and can be modified during the runtime (CMS). 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1003943 13f79535-47bb-0310-9956-ffa450edef68
2010-10-03 10:03:14 +00:00
Jacques Le Roux 07f9cdda68 A patch from Amit Sharma "Missing states of Mexico country" (https://issues.apache.org/jira/browse/OFBIZ-3975) - OFBIZ-3975
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1003597 13f79535-47bb-0310-9956-ffa450edef68
2010-10-01 17:59:47 +00:00
Hans Bakker 3a4caa0038 add role set for 'th' locale into 'Rule Base Number Format Rule Sets'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1003459 13f79535-47bb-0310-9956-ffa450edef68
2010-10-01 09:56:20 +00:00