Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux 88f8238653 A patch from Sascha Rodekamp "The Job Sandbox should never be cached" (https://issues.apache.org/jira/browse/OFBIZ-3968) - OFBIZ-3968
Sascha: We noticed that OFBiz was sending cache clears over JMS every time the job sandbox is changed. That's not a problem with one OFBiz Instance but with 20, when every instance is sending JMS messages to each other ... you can imagine...

Scott: I'd agree with this, there is really no good reason to cache JobSandbox values even though I don't believe any code does this at the moment. On a side note I ran into some problems with the Job Poller when it's under a heavy load recently and as soon as I get a chance I'll be working to reproduce and fix the issues.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1003418 13f79535-47bb-0310-9956-ffa450edef68
2010-10-01 07:49:30 +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
Hans Bakker 29b0dcefc5 make message more meaningfull and allow backtracing to entity with whereclase
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1002056 13f79535-47bb-0310-9956-ffa450edef68
2010-09-28 08:55:29 +00:00
Jacques Le Roux d0fda49879 Update Axis2 to 1.5.2 (with Axiom to 1.2.9)
According to http://ws.apache.org/axis2/:

1.5.2 is a maintenance release to fix the security issue described in CVE-2010-1632 as well as an XSS vulnerability in the admin console and some other minor issues. It also upgrades Axiom to version 1.2.9.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1001810 13f79535-47bb-0310-9956-ffa450edef68
2010-09-27 16:25:04 +00:00
David E. Jones 7fd290ef8e Removed very old functionality for form widget field actions entity-and and entity-condition that put their results automatically in the context with the field name from the form's list-name attribute, causing it to overwrite any existing list that might be in place for that; the effect was that you could not have any entity-and or entity-condition actions other than the one for the list or multi form's main list to iterate over; the proper way to do this for years now has been to specify which list you want, and this functionality was from the original approach where it was assumed for multi and list forms that you would only have one such query in the actions (which was an add-on to the original functionality that I never liked)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1001330 13f79535-47bb-0310-9956-ffa450edef68
2010-09-25 22:44:13 +00:00
David E. Jones 0155bbdb93 Added another BshInterpreter clear to fix the problem where a value set in row-actions was not available to use-when conditions, or any BSH run within that row
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1001326 13f79535-47bb-0310-9956-ffa450edef68
2010-09-25 22:20:29 +00:00
David E. Jones 1461401e71 Fixed NPE when a form field use-when attribute evaluates to null
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1001325 13f79535-47bb-0310-9956-ffa450edef68
2010-09-25 22:18:12 +00:00
Jacques Le Roux 52bc5a3dbd A patch from Weizhan Guo "multi-tenant function do not work correctly if switch from one app to another by click the menu" (https://issues.apache.org/jira/browse/OFBIZ-3956) - OFBIZ-3956
I found a problem when I switched from one app to another. The multi-tenant did not work if the username and password were the same in the main database and tenants (or different tenants). For example, the password of admin is ofbiz in main database and in DEMO1 tenant, first log in to catalog as admin of tenant DEMO1, and then switch to the content app, the data of content app is from the main database instead of DEMO1.

I debugged this problem, and the code was missing to check the userlogin tenant in checkExternalLoginKey.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1001099 13f79535-47bb-0310-9956-ffa450edef68
2010-09-24 22:45:12 +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
Bruno Busco bf83a9a2b8 Removed seed data depending on the Content application from the Example application.
This was causing a foreign key error during the run-install.
Thank you Scott for reporting in ML.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1001005 13f79535-47bb-0310-9956-ffa450edef68
2010-09-24 18:17:05 +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 e09edea40a I had reversed the 2 events
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1000638 13f79535-47bb-0310-9956-ffa450edef68
2010-09-23 21:31:25 +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
David E. Jones 9cb27b35f7 For form widget checkbox fields the id is now generated in the HTML for the first checkbox; this is mostly useful for single checkbox fields such as when using a checkbox instead of a Y/N drop-down
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@999663 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 21:55:16 +00:00
Jacques Le Roux a955bc9053 Forgot to save the TODO note :/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@999420 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 13:59:07 +00:00
Jacques Le Roux c62c5b04df Introduces an example of autocompleted dropdown use in Example. Still some work to do as the value returned contains also the Description, should contain only the Id.
TODO : return only the Id, else you need to edit the field to remove the description

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@999419 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 13:58:18 +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 c48b8741de - Used the standard Find screen/forms pattern for FindPortalPage screen.
- Added localization of all fields.
- Enabled sorting on all columns of the PortalPages list
- Added missing column fields in the PortalPages list

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998747 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 22:44:51 +00:00
Bruno Busco 45bce4d112 Removed request "ManagePortalPagesAdm" in WebTools. This is not used any more.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998746 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 22:41: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 845121a07e Removed all AddPortletAdm stuff from webtools application (request, view-map and screen).
There is no need of such a duplication, since the AddPortlet features already available in the common component is now usable from every application thanks to the view-last/save-last-view pattern.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998618 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 08:55:17 +00:00
Bruno Busco cf1bdc32ea Used "EXAMPLE" PortalPage as demo in example application instead of the "PartyProfile" PortalPage that is defined out of the framework
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998604 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 07:15:24 +00:00
Hans Bakker a2d3028094 <subcontent not working, was showing in the new article function of the content blog part
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998585 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 02:52:49 +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 55669077c7 Not sure why I have a problem with InputField, I tried another name (inputName) but it's the same. Using arguments[9] is ok though.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998321 13f79535-47bb-0310-9956-ffa450edef68
2010-09-17 21:01:18 +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
Ashish Vijaywargiya 58b5d276a6 Correcting the condition. Thanks Akash for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@998061 13f79535-47bb-0310-9956-ffa450edef68
2010-09-17 10:40:20 +00:00
Jacques Le Roux ace6cf5af1 Reverts r991485 and adds a comment to avoid this in the future
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997526 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 22:19:26 +00:00
Adam Heath d3ddc034ea I misunderstood how prototype works, I thought it modified global
classes with it's new features, so I thought that getDimension would
always be available.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997469 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 19:26:31 +00:00
Adam Heath d2dd5753f4 Remove errantly commited debug, that always showed the spinner when the
document was loaded.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997468 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 19:26:26 +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 8bf826b12f Re-apply r997397 without Nicolas's patch
Fix a bug reported by Wang Suozhu at "$ (Rp.event? Html) What do you mean?" (https://issues.apache.org/jira/browse/OFBIZ-3939) - OFBIZ-3939" D:/WorkspaceNew/vinopsTrunk/ofbiz/framework/widget/templates/htmlFormMacroLibrary.ftl

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997431 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 18:01:38 +00:00
Jacques Le Roux 0fbfa9af7b revert r997397, a patch from Nicolas from https://issues.apache.org/jira/browse/OFBIZ-3920 which I have not yet tested slipped in
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997428 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 18:00:02 +00:00
Adam Heath eca9a431da Remove old unused ofbiz.mapping.default-file-system-id parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997426 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 17:57:11 +00:00
Adam Heath 202204c9de Use setServletContextForTemplateLoading instead of
setDirectoryForTemplateLoading, so that raw File access is no longer
used.  This is to support webslinger, which uses an overlay filesystem
to merge multiple modules, and doesn't really have a single File view of
the webapp.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997422 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 17:56:52 +00:00
Adam Heath 8bd26d1863 Display the ajax spinner absolutely in the center of the document,
instead of allocating static space in the control area.  This takes the
width of the control area back to something sensible.  With always
allocated space in the control area, there ends up being a blank
space(because of the use of visibility:hidden instead of display:none).
When the Person.name and Company.Name fields are then long, this control
area breaks the flow, and word-wraps in IE, or flows underneath the
breadcrumbs in firefox.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997421 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 17:56:48 +00:00
Jacques Le Roux 6bff0778cf Fix a bug reported by Wang Suozhu at "$ (Rp.event? Html) What do you mean?" (https://issues.apache.org/jira/browse/OFBIZ-3939) - OFBIZ-3939
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@997397 13f79535-47bb-0310-9956-ffa450edef68
2010-09-15 17:00:02 +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