Commit Graph
8036 Commits
Author SHA1 Message Date
Nicolas Malin 6fd6e8a049 A patch from Anne Jessel to Support filtering on non-std date field names in performFind and prepareFind (OFBIZ-4374).
With the difficulty to test, I create a new test-suite performfindtests with five junit :
 * testPerformFindConditionFieldEquals
 * testPerformFindConditionFieldLike
 * testPerformFindConditionDistinct
 * testPerformFindFilterByDate
 * testPerformFindFilterByDateWithDedicateDateField
I also improve TestNodeMember with two fields extendFromDate and extendThruDate to realize filter on it.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1655499 13f79535-47bb-0310-9956-ffa450edef68
2015-01-28 23:25:40 +00:00
Jacques Le Roux d3a58f3ee4 Commits small RequestHandler.java changes after r1535432 (related with OFBIZ-5312)
This is in preparation of the SEO branch merging, still WIP but should be soon

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1655367 13f79535-47bb-0310-9956-ffa450edef68
2015-01-28 15:41:07 +00:00
Jacopo Cappellato 71891a76fb Moved out from JobManager.getInstance the call to reloadCrashedJobs because it was causing a deadlock issue at bootstrap when an eca rule of type "validate" is defined on the JobSandbox entity.
At bootstrap an eca definition like the following:
   <eca entity="JobSandbox" operation="store" event="validate">
          <action service="ping" mode="sync"/>
   </eca>
 is causing a deadlock because it is triggered at startup when the reloadCrashedJobs method is executed; reloadCrashedJobs  is executed holding a lock on the JobManager object; within this method a "find" operation is performed that (because of the "validate" event) triggers the action; but for this a getDispatchContext is executed and this blocks until the task (executed by a thread Executor) that reads and setups the eca rules is complete; but this task requires a lock on the same JobManager object and thus we get the deadlock
Thanks to Arun Patidar and Deepak Dixit for analyzing the issue with me.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1655046 13f79535-47bb-0310-9956-ffa450edef68
2015-01-27 14:02:50 +00:00
Jacopo Cappellato 7388a6407e Reverting my last commit for now as it because, after furthr testing it has no effect on the deadlock issue we are facing (the cache is already disabled by default so the change I did was irrelevant).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1655013 13f79535-47bb-0310-9956-ffa450edef68
2015-01-27 11:32:31 +00:00
Jacopo Cappellato 9673c8c1a6 When selecting crashed JobSandbox records, disable cache: this makes sense for the specific use case but more importantly it fixes an intermittent deadlock issue that was occurring at startup when loading eca rules. Thanks to Arun Patidar and Deepak Dixit for reporting and analyzing the issue with me.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1655010 13f79535-47bb-0310-9956-ffa450edef68
2015-01-27 11:22:52 +00:00
Adrian Crum 828aff751a Fixed a bug in the form widget models where a default type was not being supplied under certain circumstances - https://issues.apache.org/jira/browse/OFBIZ-6037.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1654824 13f79535-47bb-0310-9956-ffa450edef68
2015-01-26 14:58:43 +00:00
Adrian Crum dbd5cc3e69 Restore private final fields in ModelForm.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1654684 13f79535-47bb-0310-9956-ffa450edef68
2015-01-25 18:39:51 +00:00
Adrian Crum b1737aee5d Eliminated redundant code in the new widget classes. ModelSingleForm and ModelGrid are effectively light-weight "decorators" for the ModelForm abstract class. ModelForm still retains code for all form types (single and list) - because any attempt to separate the functionality will result in an avalanche of code modifications.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1654683 13f79535-47bb-0310-9956-ffa450edef68
2015-01-25 18:36:26 +00:00
Adrian Crum 2818037cc7 Updated widget visitor for new grid widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1654673 13f79535-47bb-0310-9956-ffa450edef68
2015-01-25 17:57:44 +00:00
Adrian Crum 3d3ea2ad67 Small fixup for my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1654672 13f79535-47bb-0310-9956-ffa450edef68
2015-01-25 17:56:26 +00:00
Adrian Crum 771e10f1c4 First pass at extracting grid widget from the form widget. This commit has a lot of duplicate code - future commits will reduce and reuse the duplicate code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1654670 13f79535-47bb-0310-9956-ffa450edef68
2015-01-25 17:18:24 +00:00
Adrian Crum 1a23f8c1d7 Some fixups for the recent widget refactor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653614 13f79535-47bb-0310-9956-ffa450edef68
2015-01-21 17:35:49 +00:00
Adrian Crum 350053b05f Fixed a portal menu item bug caused by the recent widget refactoring - https://issues.apache.org/jira/browse/OFBIZ-6022.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653597 13f79535-47bb-0310-9956-ffa450edef68
2015-01-21 16:54:18 +00:00
Jacques Le Roux 6c48f830c8 A slightly modified patch from Pierre Smits for "Remove Portal Management code from Framework/WebTools." https://issues.apache.org/jira/browse/OFBIZ-5817
Remove code related to Portal Management functionality from WebTools after equivalent code in MyPortal has been committed. 

jleroux: I just removed also the FindPortalPage entry in Webtools main.ftl


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653481 13f79535-47bb-0310-9956-ffa450edef68
2015-01-21 11:27:16 +00:00
Adrian Crum c71dc63d27 Fixed a lookup bug caused by the recent widget refactoring, reported by lmac on the user mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653296 13f79535-47bb-0310-9956-ffa450edef68
2015-01-20 16:51:56 +00:00
Jacques Le Roux d5c3acb587 Slightly modified uilabels patch from Pierre Smits for Dutch translations https://issues.apache.org/jira/browse/OFBIZ-6016
jleroux: I have made some changes within these changes, in agreement with Pierre


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653224 13f79535-47bb-0310-9956-ffa450edef68
2015-01-20 11:05:22 +00:00
Jacques Le Roux 0f284fb6af Slightly modified bunch of uilabels patches from Pierre Smits for Dutch translations (Manufacturing, Order, Party)
https://issues.apache.org/jira/browse/OFBIZ-6018
https://issues.apache.org/jira/browse/OFBIZ-6019
https://issues.apache.org/jira/browse/OFBIZ-6020

jleroux: I have fixed some trivial issues within these changes, 
Wrong change at <value xml:lang="fr">OFBiz: Gestion commerciale</value>
Removed all Dutch changes which were simply duplicating the English ones

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653208 13f79535-47bb-0310-9956-ffa450edef68
2015-01-20 07:40:50 +00:00
Jacques Le Roux aa2b996605 A modified patch from Pierre Smits for "Adding som Dutch translations to common labels." https://issues.apache.org/jira/browse/OFBIZ-6016
jleroux: I removed 
3 specific comments
<!-- ORRTIZ: TAXREPORT -->
<!-- GEO -->
<!-- ORRTIZ:BMS Applications -->
2 duplicates
<value xml:lang="nl">Gesynchroniseerd</value>
<value xml:lang="nl">Req. - geannuleerd</value>
For the later I kept the old one which seems more complete

I replaced 2482 <value xml:lang="(.*)_(.*)"> by <value xml:lang="(.*)-(.*)">


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653143 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 22:32:25 +00:00
Adrian Crum dcecdd25a4 Reorganized the screen widget src folder so classes are more organized.
This commit might break some Groovy scripts. There seemed to be a lot of C&P widget import statements, but there were no widget classes being used in the script, so I removed them. I might have overlooked something though.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652852 13f79535-47bb-0310-9956-ffa450edef68
2015-01-18 21:03:40 +00:00
Jacques Le Roux ef7494f2f2 Improvement, I had enough to remove trailing blanks when filtering by entity name
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652803 13f79535-47bb-0310-9956-ffa450edef68
2015-01-18 17:19:03 +00:00
Jacques Le Roux 109c1911c6 No functional changes, only replaces tabs (introduced by r1352861 by 4 spaces in fieldlookup.js
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652738 13f79535-47bb-0310-9956-ffa450edef68
2015-01-18 11:33:12 +00:00
Jacques Le Roux 928b06c495 A patch from Gareth Carter for "framework/images/webapp/images/fieldlookup.js throws a javascript error in google chrome from a link to ofbiz from another site" https://issues.apache.org/jira/browse/OFBIZ-5968
When you link to your ofbiz installation from another site using _blank as the target and protocol is changing from http to https, google chrome will throw an error - 
Blocked a frame with origin "https://ofbiz.company.com" from accessing a frame with origin "http://other.company.com".  The frame requesting access has a protocol of "https", the frame being accessed has a protocol of "http". Protocols must match.

This error may prevent other javascript from executing (this has caused, in our ofbiz installation, datetimepickers from working properly)

jleroux: this simply adds a try/catch block and use the parent in case of failure

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652731 13f79535-47bb-0310-9956-ffa450edef68
2015-01-18 11:12:11 +00:00
Jacques Le Roux c71805f4ce A patch from Amardeep Singh Jhajj for "Main storefront page, Featured Products (middle column) overwrites right column. Should just crop column, but not overwrite right column." https://issues.apache.org/jira/browse/OFBIZ-2602
Simply increases the width of the left and right screens. It is more appropriate UX and fixes the issue. Checked in Safari MAC OS (8.0) and latest Google Chrome, Firefox, it is working fine there.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652725 13f79535-47bb-0310-9956-ffa450edef68
2015-01-18 10:23:59 +00:00
Adrian Crum 24a54944fd Some fixups for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652688 13f79535-47bb-0310-9956-ffa450edef68
2015-01-17 22:38:38 +00:00
Adrian Crum f8daffe432 Build out XmlWidgetFieldVisitor. I am finished working on this feature, but it is not complete. There are some TODO: comments, and if anyone wants to work on them, they are welcome to do so.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652672 13f79535-47bb-0310-9956-ffa450edef68
2015-01-17 20:43:48 +00:00
Adrian Crum 28fecf1efc Revert unintentional change in my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652641 13f79535-47bb-0310-9956-ffa450edef68
2015-01-17 16:59:30 +00:00
Adrian Crum ed262228b2 Screen widget overhaul:
1. Extract and reuse common code/artifacts.
2. Organized the class structure so it makes more sense.
3. Add an XML widget visitor - this restores and improves the widget classes toString() methods. This is a WIP.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652638 13f79535-47bb-0310-9956-ffa450edef68
2015-01-17 16:47:23 +00:00
Jacopo Cappellato b5d24765cf Modified code to make sure the EntityListIterator is always closed after being used.
Thanks to Deepak Dixit and Nameet Jain for spotting the issue and identifying the offending code.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652361 13f79535-47bb-0310-9956-ffa450edef68
2015-01-16 08:34:49 +00:00
Nicolas Malin 0b0d83657c restore element parameter, auto-parameters-entity and auto-parameters-service removed by error at revision r1650821
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652312 13f79535-47bb-0310-9956-ffa450edef68
2015-01-15 23:45:59 +00:00
Jacopo Cappellato 836b1e578f Since ServiceEcaSetField are cached, if a seca definition contains a set operation with an env-name like:
<set field-name="partyId" env-name="${userLogin.partyId}"/>
then the expanded value (at the time of creation) is stored in the ServiceEcaSetField and then reused even when the seca is re-executed with a different context.
This commit fix the bug by removing the outer if statement "if (UtilValidate.isEmpty(this.value))".
Thanks to Deepak Dixit for spotting this issue.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1651593 13f79535-47bb-0310-9956-ffa450edef68
2015-01-14 08:40:08 +00:00
Jacques Le Roux b8ca5543c9 Changes in all labels files: <value xml:lang="(.*)_(.*)"> to <value xml:lang="$1-$2">
Changes also listLocales.ftl to show dashes rather than underscores

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650880 13f79535-47bb-0310-9956-ffa450edef68
2015-01-11 09:59:32 +00:00
Adrian Crum 65640c3a50 FIXME comment in screen widget schema, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650821 13f79535-47bb-0310-9956-ffa450edef68
2015-01-10 22:18:31 +00:00
Jacques Le Roux 04748292cf A patch from Wai for "state/province dropdown contains incorrect items when Canada is chosen in country dropdown" https://issues.apache.org/jira/browse/OFBIZ-5933
When creating a postal address, selecting Canada for country automatically filled the state/province dropdown with values. The issue is that the values of the state/province dropdown list are incorrect.

I was expecting the options for the state/province dropdown to have the following:
name=Alberta, value=AB
name=British Columbia, value=BC
...

What is actually present in the drop down is:
name=AB, value=AB
name=AB, value=BC
...

One observation is that this issue does not appear when the country selected is the United States. It seems to happen with Canada.
Another observation is that this issue applies to the 'en' locale. It seems to work fine for 'fr' locale.

jleroux: this was OK for Saskatchewan, that leaded to the solution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650642 13f79535-47bb-0310-9956-ffa450edef68
2015-01-09 20:19:17 +00:00
Adrian Crum 2e8e62cba7 Form widget improvement: Set focus on first control when rendering a single form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650357 13f79535-47bb-0310-9956-ffa450edef68
2015-01-08 19:25:41 +00:00
Adrian Crum ca9c76ad84 Improved code for ModelForm.java - better handling of attributes when extending a form widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650348 13f79535-47bb-0310-9956-ffa450edef68
2015-01-08 17:55:09 +00:00
Adrian Crum 14e3b15252 Some small fixups for some of my previous commits.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650347 13f79535-47bb-0310-9956-ffa450edef68
2015-01-08 17:53:59 +00:00
Adrian Crum 7c9aa8e489 Some optimizations for URL lookups.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649979 13f79535-47bb-0310-9956-ffa450edef68
2015-01-07 00:24:28 +00:00
Adrian Crum b85eb53598 Removed an unused method from UtilURL.java, added some JavaDocs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649971 13f79535-47bb-0310-9956-ffa450edef68
2015-01-06 23:22:56 +00:00
Adrian Crum 1df97ce20c Fixed a bug in FlexibleLocation.java where the optional locationresolvers.properties file was not being loaded due to static initializer recursion.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649934 13f79535-47bb-0310-9956-ffa450edef68
2015-01-06 20:21:28 +00:00
Adrian Crum c201d5f6f3 Small change to Debug.java - to avoid static initializer recursion.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649933 13f79535-47bb-0310-9956-ffa450edef68
2015-01-06 20:19:56 +00:00
Adrian Crum 38c358671f A new method for UtilProperties.java - to be used in upcoming changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649931 13f79535-47bb-0310-9956-ffa450edef68
2015-01-06 20:18:43 +00:00
Adrian Crum 1ac3b31bda Added comment about a warning, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649930 13f79535-47bb-0310-9956-ffa450edef68
2015-01-06 20:17:46 +00:00
Jacopo Cappellato 409dc4303c OFBIZ-5944: before trying to pull the values for the form's fields, check if the key exists in order to avoid an IllegalArgumentException if the map is a GenericEntity. Thanks to Christian Carlow for the report and to Deepak Dixit and Divesh Dutta for the research and useful comments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649742 13f79535-47bb-0310-9956-ffa450edef68
2015-01-06 07:43:00 +00:00
Adrian Crum b20c4adfbc Make sure InputStream is closed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649701 13f79535-47bb-0310-9956-ffa450edef68
2015-01-06 01:05:29 +00:00
Adrian Crum a02828a34e Improvement: Remove unnecessary resource check from UtilURL.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649696 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 23:58:06 +00:00
Adrian Crum ffc11dc5a3 Some code cleanup in UtilProperties.java:
1. Removed redundant cache.
2. Removed unnecessary synchronized block.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649686 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 22:54:42 +00:00
Adrian Crum 184fe56ac1 Improvement: Enable XML validation for properties files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649675 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:46:54 +00:00
Adrian Crum e64fbd6c9f Improvement: Replace library-specific concrete class with library-agnostic factory method call in UtilXml.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649674 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:43:46 +00:00
Adrian Crum 201162f6a4 Bug fix: remove invalid element from CommonUiLabels.xml.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649669 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:40:46 +00:00
Adrian Crum 79ecbea037 Bug fix: add missing attribute to ofbiz-properties.xsd.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649668 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:39:46 +00:00