Commit Graph
10472 Commits
Author SHA1 Message Date
Adrian Crum 4b7cd7434a Changed the screen widget boundary comment behavior per a discussion on the dev mailing list. Setting the widget.properties file widget.verbose property to false now acts like a "master switch" to turn off all widget boundary comments - it ignores all other settings. If the property is set to true, then the setting can be overridden in web.xml or in the screen context.
This commit also removes the demonstration widgetVerbose setting in the Example component's web.xml file - which caused some confusion, and it comments out the setting in the web.xml file that is used for creating new components.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172954 13f79535-47bb-0310-9956-ffa450edef68
2011-09-20 02:55:44 +00:00
Jacques Le Roux 4711b7a1c5 A slightly modified patch from Dimitri Unruh "Minor code style improvement" https://issues.apache.org/jira/browse/OFBIZ-4400
I forgot the services.xml file in r1172342

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172344 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 20:52:34 +00:00
Jacques Le Roux 480435601f A slightly modified patch from Dimitri Unruh "Minor code style improvement" https://issues.apache.org/jira/browse/OFBIZ-4400
In the createJsLanguageFileMapping service, the catch blocks have assigns to a local variable in a return statement.

Simplified further on Adrian's advice.

jleroux: I have also organized imports

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172342 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 20:48:27 +00:00
Jacques Le Roux d8eb4f7634 A patch from Varun Bhansaly "Issue receiving emails with attachment" https://issues.apache.org/jira/browse/OFBIZ-4413
Some Background : In our customization we have configured MCA to process incoming emails which is basically a custom service this service in turn calls service storeIncomingEmail, and rest of the custom code follows.
Now though we are able to receive emails (which can be seen in the communications in party manager), we have noticed that system does not some process the attachments and creates the link between communication event and content.

Analysis shows, MimeMessageWrapper.getAttachmentIndexes() while checking for content disposition, does a case sensitive comparison, which should rather be case insensitive.
This small change fixes the issue.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172213 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 07:53:49 +00:00
Hans Bakker 0ee18aea7d internal help should be https otherwise not work within the backend, added a new request to be able to show the help screens without ssl and logging in
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172175 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 02:58:13 +00:00
Jacques Le Roux 00afa0c283 A patch from Dimitri Unruh "Some dead variable assignments " https://issues.apache.org/jira/browse/OFBIZ-4426
Some value assignments to local variables without reading or using it.

jleroux: indeed I don't see any reasons to set the size of a byte array before feeding it with String.getBytes(), since NPE is handled above. I have even simplified it more using function composition style.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1172015 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 16:51:38 +00:00
Jacques Le Roux aa575abceb Closes https://issues.apache.org/jira/browse/OFBIZ-3403 "webtools xml data export to browser not working"
I finally think it's enough for this feature (I used html in label, but who cares)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1171983 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 14:03:49 +00:00
Hans Bakker f53cbf37f8 make the helpsystem public so the helpscreens can be referenced with a simple url
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1171443 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 08:32:22 +00:00
Sascha Rodekamp 2dd668708f FIX: IO stream objects are not closed (https://issues.apache.org/jira/browse/OFBIZ-4420) A patch from Dimitri Unruh: Some methods are creating an IO stream object without closing it, so it could result on a descriptor leak.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1171393 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 06:04:21 +00:00
Sascha Rodekamp a9248102ed FIX: encodeURI before construct a new href value for nav-buttons in layered lookup dialog. (https://issues.apache.org/jira/browse/OFBIZ-4423) A patch from Leon which fixes an encoding issue in the lookup URLs: In IE, if you use link's href to call javascript function and its parameter contains encoded multi-bytes characters, such as "%E2%82%AC" which is the result of encodeURI("€"), IE will incorrectly unescape it to "€" and then javascript call return unexpected result.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1171391 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 05:54:18 +00:00
Sascha Rodekamp 9f5323c617 FIX: blockingTestScv Service is set to export="true" (https://issues.apache.org/jira/browse/OFBIZ-4417) A patch from Dimitri Unruh which sets the export flag to false: blockingTestScv Service is set to export="true" without any user authorisation. So it is possible to "crash" the whole system.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1171028 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 10:03:51 +00:00
Sascha Rodekamp 46b29a9911 IMPROVEMENT: Replace String concatenation in a loop (https://issues.apache.org/jira/browse/OFBIZ-4418) A patch from Dimitri Unruh.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1170961 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 06:04:29 +00:00
Sascha Rodekamp 16607bb1ac UPDATE: Some improvements with Map iterations (https://issues.apache.org/jira/browse/OFBIZ-4415) A patch from Dimitri Unruh which improves some Map Iterations.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1170525 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 10:52:01 +00:00
Sascha Rodekamp 5a0b643c39 Building a String using concatenation in a loop (https://issues.apache.org/jira/browse/OFBIZ-4416). A patch from Dimitri Unruh: In UtilValidate.java some methods building a String using concatenation in a loop. We can obtaine better performance by using a StringBuilder
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1170520 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 10:37:53 +00:00
Sascha Rodekamp 61f78cca06 PATCH: Exception when entering wrong current password on requirePasswordChange (https://issues.apache.org/jira/browse/OFBIZ-4356). A patch from Dimitri Unruh to fix the wrong current password on a required password change.
Orig Msg:
Here is a step-by-step how the error occures:
1) Request a new password by entering your userlogin
2) Login and you will get to the "requirePasswordChange"-Page (depending on properties)
3) If you enter a wrong current password on this page the exception is thrown.
OFBiz tries to call the service "updatePassword" with a bad userLogin and an Exception is thrown:

org.ofbiz.service.ServiceAuthException: User authorization is required for this service: updatePassword [updatePassword::file:/C:/Workspace/apache_ofbiz/framework/common/servicedef/services.xml::Update a UserLogin ...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1170473 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 08:30:33 +00:00
Sascha Rodekamp c6226ef627 UPDATE: Missing german conditional label (https://issues.apache.org/jira/browse/OFBIZ-4404). One new german conditional label from Dimitri Unruh.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1170466 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 08:00:02 +00:00
Jacques Le Roux 617330e6d5 Continued refactoring (WIP...)
* UtilValidate.is(Not)Empty wherever possible
* Remove useless boiler plate code which makes things harder to read
 * if on one line w/out {}, it avoid future errors: you can't miss the block if you need to add a line
 * else on one line w/out {}, it avoid future errors: you can't miss the block if you need to add a line
 * no else when return in previous if
 The result is a much easier code to read. I'd recommend to use this style everywhere in OFBiz. Of course this suppose a screen with larger width than in 2000 years...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1170442 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 06:18:26 +00:00
Adrian Crum 79110878f1 Have FlexibleMapAccessor and FlexibleStringExpander implement IsEmpty so they can be evaluated by the various validation utilities.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1170125 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 11:51:49 +00:00
Jacques Le Roux e844e0dff1 Revert to r1169754, will see later: FlexibleStringExpander issues: UtilValidate.is(No)tEmpty() can't be used...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1170109 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 10:50:53 +00:00
Jacques Le Roux af139395c4 For historical reason, revert recent geo data changes for USA and CAN.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1170061 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 06:45:13 +00:00
Jacques Le Roux 065f14810c Related to the recent UtilValidate.is(Not)Empty() effort. I found the reason, you can't safely pass a FlexibleStringExpander to UtilValidate.is(Not)Empty. All other cases were all right. Lesson learned the hard way, I put comments about that...
I also refactored, I prefer if/else with only one short expression to be on the same line, notably when return is used (then else is useless)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1169917 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 20:48:10 +00:00
Jacques Le Roux 0305d6560d Related to the recent UtilValidate.is(Not)Empty() effort. This part is OK and I prefer this style, easier to read and check (sorry not for the 1st review). I will continue on the rest, if I don't read myself blind on it...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1169891 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 19:35:20 +00:00
Jacques Le Roux 97ba35d771 Adds Swiss Geo data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1169819 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 16:25:12 +00:00
Jacques Le Roux 8d9d3f9942 Normalizes
* Canada GeoId for Province prefixed with CA- as it should be (following ISO 3166-2:CA,  http://en.wikipedia.org/wiki/ISO_3166-2:CA)

* USA GeoId for Province prefixed with US- as it should be (following ISO 3166-2:US,  http://en.wikipedia.org/wiki/ISO_3166-2:US). I did not see any reasons to no use the same scheme for "US Armed Forces provinces"

No other countries had the same problem

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1169790 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 15:11:00 +00:00
Jacques Le Roux e497883d62 VCard.java: replaec an UtilValidate.isNotEmpty() by a simple isEmpty()
ShoppingCart.java: a tabs has been automatically replaced by 8 spaces, fixes it
UtilValidate.java: removes useless parentheses
GeneriDao.java: fixes a wrong UtilValidate.isNotEmpty
ModelFormField.java: revert all UtilValidate.is(Not)Empty() changes though I ddid not find an error there, it must be one because https://localhost:8443/humanres/control/EditResponsibilityTypes is not rendered correctly. I will check again

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1169754 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 14:13:17 +00:00
Jacques Le Roux a7f92ce35f Fix a bug introduced in r1169478
Thanks to Hans for reporting on dev ML

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1169701 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 11:47:15 +00:00
Jacques Le Roux 4bd75e57d8 Change artifact info label: adds a warning about duration before availability
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1169479 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 17:06:29 +00:00
Jacques Le Roux 2b712efb98 No functional changes, simple code refactoring around UtilValidate.is(Not)Empty()
Changes implementation of UtilValidate.isEmpty() for Collection and Map by using isEmpty() instead of c.size() == 0). It's more clear and as efficient. Removes also useless parentheses there.

Makes use of UtilValidate.is(Not)Empty() everywhere it makes senses. This for 2 reasons:
* Make the code more readable by replacing the (!)null/isEmpty pattern.
* Avoid possible NPEs when only isEmpty() was used (after Entity.find... for instance). I found a lot of cases (242 today) where isEmpty() could perhaps be replaced in Framework. But I guess no NPE checks were missing there and anyway it was too much for me to check them all... So I only did the relevant changes in Applications...



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1169478 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 17:06:11 +00:00
Jacques Le Roux 76168a4d8a A patch from Leon "trivial update to "convertUom" script" https://issues.apache.org/jira/browse/OFBIZ-4402
If we setup the custom uom conversion method which is called by convertUom service, and then invoke convertUom service, the exception raised:

    Could not complete the Convert UOM values...blahblah...Unknown parameter found: [convertUomCustom.asOfDate]Unknown parameter found: [convertUomCustom.defaultDecimalScale]Unknown parameter found: [convertUomCustom.defaultRoundingMode]Unknown parameter found: [convertUomCustom.purposeEnumId].

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1167480 13f79535-47bb-0310-9956-ffa450edef68
2011-09-10 09:29:28 +00:00
Adrian Crum ed013f302b A small refactoring of ArtifactInfoBase.java:
1. Fixed infinite recursion reported by Dimitri Unruh (https://issues.apache.org/jira/browse/OFBIZ-4398).

2. Eliminated expensive repetitive String concatenations.

3. Added hashCode() - since the class implements equals().


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1167117 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 11:51:13 +00:00
Hans Bakker 483299c5ec New product type: Fixed Asset Usage For Rental of an asset which is shipped from and returned to inventory. Including Junit test and demo data. More explanation will follow in a blog on the 'what is new page'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1167015 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 06:40:28 +00:00
Sascha Rodekamp 568a9e442d Update to jQuery validation 1.8.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1166288 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07 18:11:01 +00:00
Adrian Crum 642c6383e5 Fix NPE I introduced in my previous commit. Reported by Chatree Srichart.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1165233 13f79535-47bb-0310-9956-ffa450edef68
2011-09-05 10:47:32 +00:00
Jacques Le Roux b01369ef25 Migration to Tomcat 6.0.33 due to a security issue in previous revisions, see http://tomcat.apache.org/download-60.cgi#6.0.33
I have kept tomcat-6.0.32-tomcat-juli-adapters.jar & tomcat-6.0.32-tomcat-juli.jar and renamed them to 33, did not find any issues...



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1165125 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 22:44:50 +00:00
Jacques Le Roux 60dc2a519a An effort has been made in r1163575. But it needed a bit more love. I simplified by renaming to geoAssocTypeId instead of uselessly complicated stateProvncGeoAssocTypeId
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1165124 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 22:33:17 +00:00
Jacques Le Roux 30b4566a7c Revert r1165076 (at Adrian's right demand)
Actually I hastily did it bad using static instead of caching. Anyway, I checked there are no real needs to change current code in OFBiz for perf.: one instance is in an exception and the other not called OOTB...

Was:  Closes https://issues.apache.org/jira/browse/OFBIZ-4201

"DateFormat.getDateTimeInstance() is very expensive, we can cache it to improve performance"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1165084 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 19:07:16 +00:00
Adrian Crum 78106cefd6 Some minor en spelling fixes for CommonUiLabels.xml plus some en_GB additions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1165081 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 18:29:03 +00:00
Jacques Le Roux fd92b0eca1 Closes https://issues.apache.org/jira/browse/OFBIZ-4201
"DateFormat.getDateTimeInstance() is very expensive, we can cache it to improve performance"

jlr: It's not really cache but a static class constant

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1165076 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 17:08:54 +00:00
Adrian Crum b891086624 Fixed a ModelFormField bug introduced in rev 1075322 - date and date-time form fields were throwing exceptions because the description Strings were HTML encoded before being converted to other types. I moved the HTML encoding to post-conversion.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1165011 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 13:26:57 +00:00
Adrian Crum fb9ae9ffb5 Added some Calendar<->Date data type converters. Commit includes some unintended code formatting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1164906 13f79535-47bb-0310-9956-ffa450edef68
2011-09-03 18:36:39 +00:00
Adrian Crum aa531f10af Improved mini-language <set> operation: now supports groovy: syntax in the from-field attribute.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1164712 13f79535-47bb-0310-9956-ffa450edef68
2011-09-02 20:55:15 +00:00
Hans Bakker 1ce4f86892 change the component template to use the application decorator
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163944 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 08:45:39 +00:00
Sascha Rodekamp 074a2498f3 Fix the CountryAddressFormat relation to make the StateDropDown fields work again. The field-name and rel-field name were twisted.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163575 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 11:20:16 +00:00
Sascha Rodekamp 28eff53625 Update to the current jQuery Version 1.6.2
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163547 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 09:26:56 +00:00
Sascha Rodekamp d6c19a4ac8 A patch from Leon to get the correct "jquery.ui.datepicker-xx-XX.js" (https://issues.apache.org/jira/browse/OFBIZ-4377)
It uses "locale" (e.g. zh_TW) to form the jquery.ui.datepicker file name in method JsLanguageFileMappingCreator.createJsLanguageFileMapping, but jquery uses dash ("-") instead of underscore ("_") to concat the language code and country code, such as zh-TW vs. zh_TW.

A very trivial update to JsLanguageFileMappingCreator.java, and after that, update the JsLanguageFileMapping.java file by running service "createJsLanguageFileMapping". In attached, contains both of patches to these two files.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163533 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 08:57:29 +00:00
Jacques Le Roux 9cc20de930 Remove MEXCAN from US geo data file
Forgot to save before committing r1163475

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163479 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 03:36:06 +00:00
Jacques Le Roux 0aed887dbd Splits USA , Mexico and Canada geo data. I let USCAN and USMEXCAN in US file, I put MEXCAN in MX file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163475 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31 03:02:24 +00:00
Jacques Le Roux 6891cdeeea A patch from Leon "improve the behavior of nested lookup dialogs (ajax mode) " https://issues.apache.org/jira/browse/OFBIZ-4380
Nested lookup dialogs: in one lookup dialog, it opens another lookup dialog.
trivial improvements:
1. "enter" event only occurs to lookup dialog itself
2. if mouse click out side the lookup dialog, only current activated dialog closes

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163093 13f79535-47bb-0310-9956-ffa450edef68
2011-08-30 05:56:52 +00:00
Hans Bakker 2a61998b2d junit tests to test the change in r1163083 to have invoicing per order/or shipment. Also added spring jar files to be able to test ofbiz events.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163084 13f79535-47bb-0310-9956-ffa450edef68
2011-08-30 04:25:28 +00:00
Adrian Crum 14cc4128e2 XML formatting and some documentation for geo-related entities. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1162940 13f79535-47bb-0310-9956-ffa450edef68
2011-08-29 18:38:57 +00:00