Commit Graph
2222 Commits
Author SHA1 Message Date
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 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 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
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
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
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 ab77f16cba allow < and > in noteinfo field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1003365 13f79535-47bb-0310-9956-ffa450edef68
2010-10-01 02:57:13 +00:00
Jacques Le Roux bfccb22656 Introduces a new checkUomConversion service which returns a boolean if UomConversion exists.
It may be used by a checkUomConversion javascript which uses the getServiceResult. I put it in the getDependentDropdownValues.js file for the moment. But anyway at term I will refactor all these Ajax related scripts (like in selectall.js) in a specific file.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1002353 13f79535-47bb-0310-9956-ffa450edef68
2010-09-28 20:58:21 +00:00
Jacques Le Roux 312bbae5a4 In linkGeos service I reversed the 2 geos (geoId and GeoIdTo) in GeoAssoc creation (backported from jQuery branch)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1001050 13f79535-47bb-0310-9956-ffa450edef68
2010-09-24 19:43:38 +00:00
David E. Jones 9b940f0056 Changed sendMailFromScreen service to support a list of attachments instead of just one
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1000753 13f79535-47bb-0310-9956-ffa450edef68
2010-09-24 07:47:05 +00:00
Jacques Le Roux fdea7b2527 Change how Webtools/Geo Management is done:
* Now the link from the Find list goes to the Link Geo screen. It opens (focus on Geo field) with selected multiples (in function of assoc type) for the geo selected in Find list, and changes accordingly. In jQuery branch it will use asmselect for that 
* So the Create screen is now a Create/Edit screen with a lookup for Geo choice

This continues to allow geos Edition/Creation and to links them, but now shows also the links between geos in the Link screen. Due to native limitations of select multiples, it's not very useful in trunk but interesting in jQuery branch (I did not try to find an equivalent to asmselect in the Prototype worls, still doable...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1000586 13f79535-47bb-0310-9956-ffa450edef68
2010-09-23 19:06:22 +00:00
Jacques Le Roux e842192d80 Better French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1000521 13f79535-47bb-0310-9956-ffa450edef68
2010-09-23 16:16:19 +00:00
Jacques Le Roux d409250b6a Fixes the linkGeos service. It was able not remove, it was only creating.
Introduce a new getRelatedGeos service which will be used soon in the Webtools/Geo mnagement. It comes from the jQuery branch and I have still not rewritten the jQuery to Prototype part. This should make smoother next merge from trunk in jQuery branch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1000434 13f79535-47bb-0310-9956-ffa450edef68
2010-09-23 12:47:14 +00:00
Jacques Le Roux 0715959cbd Separates Lookup request from Ajax requests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1000105 13f79535-47bb-0310-9956-ffa450edef68
2010-09-22 17:54:01 +00:00
Jacques Le Roux 8172640f9a Removes dependencies from Example component to Party component by replacing Party lookups by Geo lookups.
Removes useless specific party lookups in Example component

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@999390 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 13:07:57 +00:00
Bruno Busco 62da93a6a2 - Moved a SecurityGroupId UiLabel from Party to Common
- Added some UiLabel for PortalPage FormFields

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998745 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 22:40:00 +00:00
Bruno Busco 44d6f3b2d1 - Removed more ***Adm requests from webtools application. Used view-last/save-last-view pattern instead to have the same portlet handling requests usable from everywhere.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998691 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 16:13:12 +00:00
Bruno Busco 2704f7f99f - Removed several ***Adm requests from webtools application. Used view-last/save-last-view pattern instead to have the same portlet handling requests usable from everywhere.
- Replaced AddPortlet request and view-map with addPortlet. This seems to be the standard we use.
- Portlet attributes are now edited using a dedicated screen. This is how it works in the new PortalPage widget. I used the same system in the actual PortalPage system also because it was too complicated to handle it in two different way. In any case it should not hurt.
- Removed a debug string in the PortalPageColumn renderer.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998686 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 15:46:17 +00:00
Bruno Busco 3bbd2d8598 Added the <include-portal-page> widget. OFBIZ-3625 https://issues.apache.org/jira/browse/OFBIZ-3625
Using this widget, a PortalPage can now be easily rendered in any screen.
At the bottom of the page an "Edit ON/OFF" button can be used to switch the PortalPage edit mode ON and OFF so that the Portal Page can be edited "in place".
All the portlet editing requests are handled using the "save-last-view" request attribute so that a dedicated screen can be shown to set the Portlet attributes and the column width and, when submitted, the user is taken back to the portal page he was editing.

Those new requests will be used in a later commit to eliminate all the duplicated ****Adm requests that have been introduced when the Webtools portal admin screen has been created.
A simple use of the widget has been added in the Example application.

TODO:
- At the moment the portal page editing is performed on the portal page itself and no portal derivation from the "main" one is performed. This will be done in a later commit.
- The portlet moving controls both manually and by drag and drop have not been implemented yet.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998570 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 00:09:39 +00:00
Jacques Le Roux bf4fba2def This introduces changes that will be used soon (after some client tests) to refactor the Price Rules UI. They introduces any functional changes yet, all new things are optional.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998305 13f79535-47bb-0310-9956-ffa450edef68
2010-09-17 20:33:40 +00:00
David E. Jones 4ecf9a8959 Added deleteEnumeration service, changed to allow safe HTML in enum description field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997451 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 18:49:51 +00:00
Adam Heath 4b054e2d11 Missed some window->load document->dom:loaded changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997440 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 18:20:42 +00:00
Jacques Le Roux a5324b94c3 OK, my explanation at r996840 did not make sense. If I want GeoName and geoTypeId to create then I need them when updating as well. At least it's what I think....
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996853 13f79535-47bb-0310-9956-ffa450edef68
2010-09-14 11:50:55 +00:00
Jacques Le Roux 4f8186bc3f Oops, checking http://svn.apache.org/viewvc?rev=996789&view=rev I see that I confused geoId and geoTypeId. When creating a Geo we want geoTypeId to be mandatory (IMO to create a Geo we need at least GeoId, GeoName and geoTypeId). On the other hand update needs anything (it's already there)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996840 13f79535-47bb-0310-9956-ffa450edef68
2010-09-14 11:10:03 +00:00
Jacques Le Roux e8d5e8843e No functional changes, simply remove redundant useless information
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996789 13f79535-47bb-0310-9956-ffa450edef68
2010-09-14 08:31:09 +00:00
Jacques Le Roux 68ef437347 New simple Geo Management in Webtools. It still misses a Geo Assoc Find Screen.
For the moment in trunk the Link Geos screen use a standard multiple dropdown. It's not easy to use (see why at http://www.ryancramer.com/journal/entries/select_multiple). In the jQuery branch I have used the asmselect plugin, much easier for end users. Actually I'm not totally satisfied by it either. It's a beta and seems to be freezed. Also the way the field is shown is not flexible enough. It's a fixed size area and I tried to work around. I could be done better though. I will have a look. Sascha thought we could use jQuery.ui.sortable but I don't think it exactly corresponds to the feature needed.

I have also changed some labels names and removed/grouped some requests (only in common now)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996658 13f79535-47bb-0310-9956-ffa450edef68
2010-09-13 19:35:40 +00:00
Jacques Le Roux de2a709e43 Fix a bug while working on future Webtools/Geo Management (soon coming). Working from a branch I really begin to think about using Git, though using Eclipse is flexible enough for now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996565 13f79535-47bb-0310-9956-ffa450edef68
2010-09-13 15:00:21 +00:00
Jacques Le Roux 71b5c1f8d3 Minor changes in the Example component.
Also changes from CommonPartyID to CommonPartyId (following our rules)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996476 13f79535-47bb-0310-9956-ffa450edef68
2010-09-13 09:59:08 +00:00
Bruno Busco 63e4c236d0 Deleted requests and view-maps no longer used. (Fixes errors reported in logs using the ArtifactInfo screen)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@996323 13f79535-47bb-0310-9956-ffa450edef68
2010-09-12 14:46:20 +00:00
Erwan de Ferrieres e7faeca8f3 Missing entity uiLabels on CUSTREQ_STTS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@992321 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 15:05:29 +00:00
Erwan de Ferrieres ab43dfbf0e Showing the title when a portal page is displayed on screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991947 13f79535-47bb-0310-9956-ffa450edef68
2010-09-02 14:27:17 +00:00
David E. Jones 5c5149bf11 Small change to short ton description as it seems more people are familiar with the term US ton than short ton
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@991279 13f79535-47bb-0310-9956-ffa450edef68
2010-08-31 18:14:39 +00:00
Ashish Vijaywargiya e90d83e6af Applied patch from jira issue OFBIZ-3909 - Bug in showing online estimate rate on UPS services.
UPS Online shipping rates are showing wrong values when product weight having different weightUomId. It doesn't support UOM Conversion as it is working in USPS services.
So fixing this bug, following work is done.

1) Calling generic methods "getPackageSplit", "getProductItemInfo" & "calcPackageWeight" methods from ShipmentWorker.java
2) Removed duplicate methods from UpsServices.java

Thanks Amit for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@990751 13f79535-47bb-0310-9956-ffa450edef68
2010-08-30 09:55:02 +00:00
Jacques Le Roux d41c42d069 Fix a bug in setDependentDropdownValuesJs.ftl (used in conjunction with getDependentDropdownValues.js)
I just realize that I missed to change from maindId to paramKey in the observe event. It works with country where the values are the same (countryGeoId), but in other cases it does not (notably in the issue reported at https://issues.apache.org/jira/browse/OFBIZ-3247

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989829 13f79535-47bb-0310-9956-ffa450edef68
2010-08-26 17:11:43 +00:00
Bruno Busco 6cb038332c Removed settings of hideSearch field. This is not used any more.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989397 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 22:54:50 +00:00
Jacques Le Roux 9fd01fcd31 Removes a framework dependency on Marketing component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989389 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 22:20:18 +00:00
Jacques Le Roux 792aa82bee A solution for "State field is missing - Not in List or N/A" reported by Sam Hamilton at https://issues.apache.org/jira/browse/OFBIZ-3247 - OFBIZ-3247
I finally decided to use the new Dependent Dropdowns mechanim.
I have also refined how it's used in Example to avoid confusion, so changed setDependentDropdownValuesJs.ftl to pass paramKey when it's different from mainId

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988508 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 12:32:52 +00:00
Erwan de Ferrieres 0c6075f89b Just a formatting issue, no functional change
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987755 13f79535-47bb-0310-9956-ffa450edef68
2010-08-21 13:37:37 +00:00
Bruno Busco ede7fd1009 More appropriate entity description. (A false framework to product dependence ;-)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@987131 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 11:27:53 +00:00
Jacques Le Roux 5fdb5272c5 Forgot to put the license headers into new files in r986370
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986407 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 17:40:28 +00:00
Jacques Le Roux 7a285eed10 Miscellaneous improvement in Form Widgets examples. Notably introduces an, as much as possible generalized (so far), dependent drop-downs example. I have introduced 2 couples of dependent drop-downs.
The 1st one, country/states, is a common one and does not need (ie it's better to not) to be generalized. It can be used as is. It needs some pieces which are all included, see comments and follow... 

The 2d, category/products, have been taken as example but is not a good candidate. What if you get much categ or/and products? Anyway it's a good OOTB example and I had it at hand, so I used it. I have tried to generalize (abstract the couple of dropdowns) and it's almost there. The only issue I crossed, is when you want to use a couple of dependent drop-downs in the same form. As it's not a common case, the setDependentDropdownValuesJs.ftl template-script can be used in most cases...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@986370 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 16:18:24 +00:00