Commit Graph
430 Commits
Author SHA1 Message Date
Jacques Le Roux 84e102a6a1 Revert "Merge branch 'JacquesLeRoux-POC-for-CSRF-Token-OFBIZ-11306' into trunk"
This reverts commit 27e57522b1.
2020-04-05 10:05:16 +02:00
Jacques Le Roux 27e57522b1 Merge branch 'JacquesLeRoux-POC-for-CSRF-Token-OFBIZ-11306' into trunk
Because of GitHub message on PR56:
This branch cannot be rebased due to conflicts

Much Conflicts, but that should be OK
2020-04-04 18:41:14 +02:00
Deepak Dixit 1a8903e1d5 Fix build failure for release17.12 2020-02-23 16:56:57 +05:30
Suraj Khurana c175337b84 Fixed: UserLoginPasswordHistory is not maintaining password as present in UserLogin.
(OFBIZ-10802)
Thanks Rohit Koushal for the patch. Thanks Jacques Le Roux and Gil Portenseigne for the review.
2020-02-22 12:53:28 +05:30
Jacques Le Roux b2e3cc717d Fixed: impersonateLogin
(OFBIZ-5409)

I reopended this old issue because, while working on  OFBIZ-11329, I found that
userLogin and impersonateLogin should be removed from
jsonResponseFromRequestAttributes

Thanks: James Yong for pointing that out

# Conflicts:
#	framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
2020-02-04 15:48:46 +01:00
Mathieu Lirzin d837b65d69 Fixed: Fix javadoc build for OpenJDK 11
(OFBIZ-10757)

This removes HTML5 deprecated stuff such as ‘<tt>’ elements, and
‘cellpadding’ table attributes which were breaking the ‘:javadoc’
Gradle task when using OpenJDK 11.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1859125 13f79535-47bb-0310-9956-ffa450edef68
2019-05-11 20:44:17 +00:00
Jacques Le Roux 69a46f08f4 "Applied fix from trunk for revision: 1857099"
------------------------------------------------------------------------
r1857099 | jleroux | 2019-04-08 11:17:55 +0200 (lun. 08 avr. 2019) | 12 lignes

Improved: Using try-with-resources with File IO Objects.
(OFBIZ-9855)

Uses try with resources for File IO objects like ObjectInputStream and other 
objects. File classes have the AutoCloseable interface.

jleroux: this is only a part of the 2nd patch. The 1st patch will be committed
soon too...

All tests pass

Thanks: Pradhan Yash Sharma
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1857487 13f79535-47bb-0310-9956-ffa450edef68
2019-04-13 17:50:42 +00:00
Jacques Le Roux c339325d30 "Applied fix from trunk for revision: 1856667 "
------------------------------------------------------------------------
r1856667 | jleroux | 2019-03-31 11:14:16 +0200 (dim. 31 mars 2019) | 10 lignes

Fixed: EmailServices.sendMail causes a NPE, when sendFrom is missing
(OFBIZ-10706)

I tried to find the history for why the service does not take the 
defaultFromEmailAddress property from general.properties and I found that It was 
last modified in revision r418498 on 02/07/2006, I think it was always broken.

This uses defaultFromEmailAddress property in sendMail if sendFrom is missing

Thanks: Benjanmin Jugl reported, Pawan Verma fixed and others for discussion
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1856669 13f79535-47bb-0310-9956-ffa450edef68
2019-03-31 09:17:06 +00:00
Gil Portenseigne dc1864f983 Fixed: Initial set of hasLoggedOut flag when logging in
(OFBIZ-10506)

Thanks Dennis for your patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1837585 13f79535-47bb-0310-9956-ffa450edef68
2018-08-07 09:35:23 +00:00
Gil Portenseigne a0df9e164a Fixed: GetLocaleList call can provide duplicate results
(OFBIZ-10458)

A new Junit test is implemented to validate that no duplicates are present.
Groovy service has been refactored to use a more functional style

Thanks Mathieu Lirzin for reporting and providing the patch


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1835283 13f79535-47bb-0310-9956-ffa450edef68
2018-07-06 21:10:50 +00:00
Michael Brohl e697cde814 Applied fix from trunk for revision: 1826674
===

Fixed: EmailServices.sendMailFromScreen attachment rendering broken.
(OFBIZ-10246)

Thanks Martin for reporting and providing the patch.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1826675 13f79535-47bb-0310-9956-ffa450edef68
2018-03-13 19:47:09 +00:00
James Yong ba2e822f27 Implemented: Tomcat SSO
(OFBIZ-10047)

This allow developers the option to use Tomcat SSO, instead of externalLoginKey, for SSO.

Thanks: Jacques and Michael for the reviews

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1819133 13f79535-47bb-0310-9956-ffa450edef68
2017-12-23 10:39:44 +00:00
Deepak Dixit fb77a3c477 Improved: Logging: change all System.out/.err/.. println to Debug.log... in the code base (OFBIZ-10045)
Thanks Michael Brohl and Kyra Pritzel-Hentley for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1819124 13f79535-47bb-0310-9956-ffa450edef68
2017-12-23 09:08:04 +00:00
Jacques Le Roux 35ee954560 Completed: Remove applet concept in OFBiz
(OFBIZ-10094)

Following discussion at http://markmail.org/message/dlp4zoo3xxuiefpn :

While reviewing http://svn.apache.org/viewvc?view=revision&revision=1811438 
I stumbled upon the usage of Java Applets

It's still possible to use Java Applets in browsers but most of the time it's 
not OOTB https://www.digitalcitizen.life/how-enable-java-all-major-web-browsers

And Java 9 deprecates it https://www.java.com/en/download/faq/jdk9_plugin.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818646 13f79535-47bb-0310-9956-ffa450edef68
2017-12-19 10:33:15 +00:00
Michael Brohl b932ce362a Improved: General refactoring and code improvements, package
org.apache.ofbiz.common.login.
(OFBIZ-9880)

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818567 13f79535-47bb-0310-9956-ffa450edef68
2017-12-18 13:45:13 +00:00
Michael Brohl 6329196e14 Improved: General refactoring and code improvements, package
org.apache.ofbiz.common.email.
(OFBIZ-9876)

Thanks Julian Leichert for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818557 13f79535-47bb-0310-9956-ffa450edef68
2017-12-18 12:21:16 +00:00
Michael Brohl dcf4ab8ef6 Improved: General refactoring and code improvements, package
org.apache.ofbiz.common.image.
(OFBIZ-9878)

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818556 13f79535-47bb-0310-9956-ffa450edef68
2017-12-18 12:01:53 +00:00
Michael Brohl 5bfe284067 Improved: General refactoring and code improvements, package
org.apache.ofbiz.common.qrcode.
(OFBIZ-9883)

Thanks Julian Leichert for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818551 13f79535-47bb-0310-9956-ffa450edef68
2017-12-18 10:52:13 +00:00
Michael Brohl 1d75c7f50c Improved: General refactoring and code improvements, package
org.apache.ofbiz.common.preferences.
(OFBIZ-9927)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818548 13f79535-47bb-0310-9956-ffa450edef68
2017-12-18 10:16:05 +00:00
Michael Brohl 4f85d01d72 Improved: General refactoring and code improvements, package
org.apache.ofbiz.common.
(OFBIZ-9930)

Thanks Dennis Balkir for reporting and providing the patches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818544 13f79535-47bb-0310-9956-ffa450edef68
2017-12-18 09:51:44 +00:00
Michael Brohl fe66233dc4 Improved: No functional change, removed obsolete import.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818466 13f79535-47bb-0310-9956-ffa450edef68
2017-12-17 09:41:58 +00:00
Jacques Le Roux e0d2057456 Improved: Always check if debug verbose is on when using Debug.logVerbose()
(OFBIZ-10052)

We discussed on this point: http://markmail.org/message/mplvusuqn7oshl4v 
and we agreed about better doing a check when using Debug.logVerbose().

I checked there are 300+ cases like that. Since it's an easy S/R 
This implements it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818005 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 12:43:05 +00:00
Deepak Dixit 7e19de9966 Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029)
Applied slightly modified patch, rearrange import properly, 
Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1818003 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 12:03:17 +00:00
Deepak Dixit 63258e90f8 Reverted r#1817989, workign fine locally, reverted for now will check and commit again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817998 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 10:42:32 +00:00
Deepak Dixit d1f85a7e5d Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029)
Applied slightly modified patch, rearrange import properly, 
Thanks Suraj Khurana for your contribution

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817989 13f79535-47bb-0310-9956-ffa450edef68
2017-12-13 09:21:33 +00:00
Michael Brohl bf6310c5e4 Improved: General refactoring and code improvements, package
org.apache.ofbiz.common.authentication.
(OFBIZ-9875)

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817751 13f79535-47bb-0310-9956-ffa450edef68
2017-12-11 08:10:16 +00:00
Jacques Le Roux 48a2f6dc8b Fixed: Fix Default or Empty Catch block in Java and Groovy files
(OFBIZ-8341)

While reviewing recent Michael's FB commits I spotted a bunch of (unrelated) 
swallowed exceptions. This fixes them

Also few formatting and use of multi catches



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817703 13f79535-47bb-0310-9956-ffa450edef68
2017-12-10 12:00:07 +00:00
Jacques Le Roux cac7d76cba Implemented: Handle service response effectively
(OFBIZ-9981)
Included Debug.logError in ServiceUtil.returnProblem so that in case of any 
error occurred and handled, it will always be logged on the console.
jleroux: I put a toString() there, Debug.logError() does not work with maps

Also no functional change (better code) in QRCodeEvents
jleroux: I also replaced tabs by spaces there 
            and put debug info in exceptions

Thanks: Suraj Khurana

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817455 13f79535-47bb-0310-9956-ffa450edef68
2017-12-08 05:04:23 +00:00
Jacques Le Roux 8021fd3717 Improved: Upgrade Jquery 1.11.0 to JQuery 3.2.1
(OFBIZ-9978)

Includes following changes
jQuery UI upgraded to 1.12.1
Included CSS files to theme properties and screens.

Manually added datepicker-en.js and datepicker-it-CH.js a new candidate added 
it to jsLanguageFilesMapping
Updated defaultDateTime path of dateTime picker it was having path of 
timepicker files.

I18n files for datepicker renamed from jquery.ui.datepicker- to datepicker- 
as comes with the JQuery ui package so that we don’t have to rename files 
manually everytime we upgrade.
https://github.com/jquery/jquery-ui/tree/master/ui/i18n
Can’t get jquery-ui-i18n.js file though it was not used either.

I have not updated jQuery.cookie-1.4.0.js as it is related to jstree and we will 
update & move it when we will update jstree.

Jeditable 1.7.2 upgraded to 1.7.3

I feel JQuery ui should also be in plugins folder with other JQuery plugin

Thanks: Aditya

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817026 13f79535-47bb-0310-9956-ffa450edef68
2017-12-03 10:15:55 +00:00
Jacques Le Roux b7127e1ed2 Improved: Upgrade Jquery 1.11.0 to JQuery 3.2.1
(OFBIZ-9978)

Upgrades jQuery Timepicker Addon to 1.6.3 
https://github.com/trentrichardson/jQuery-Timepicker-Addon/
 jQuery UI Slider Access comes with JQuery Timepicker addon package.
 Moved localization to i18n (as comes with package) & made changes accordingly
 Working well with even jQuery UI 1.10.

Steps to verify:
https://localhost:8443/ordermgr/control/ListQuoteRoles?quoteId=CQ0001
https://localhost:8443/example/control/FormWidgetExamples
https://localhost:8443/catalog/control/EditProduct

Interestingly it supports Millisecond, Microsecond and Time Zone too.

jleroux: as required with such changes I ran the createJsLanguageFileMapping 
service to create or update the JsLanguageFilesMapping class content (this is
documented in JsLanguageFileMappingCreator class
We got some new ones:
-fa.js
-lv.js
-mk.js
-sl.js
-sq.js
but lost CZ (not quite sure about that one, I vaguely remember something we
discussed with Aditya )

Thanks: Aditya 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1816377 13f79535-47bb-0310-9956-ffa450edef68
2017-11-26 10:18:36 +00:00
Jacques Le Roux c1a11e83ae Fixed: Fix Default or Empty Catch block in Java and Groovy files
(OFBIZ-8341)

While reviewing r1812057 I spotted a bunch of swallowed ClassCastExceptions

I then reviewed all ClassCastExceptions and this fixes all of them with a 
minimal logging

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1815797 13f79535-47bb-0310-9956-ffa450edef68
2017-11-20 12:32:44 +00:00
Jacques Le Roux 3933ba15c0 No functional change, fixes typos and formatting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1815774 13f79535-47bb-0310-9956-ffa450edef68
2017-11-20 07:34:07 +00:00
Michael Brohl ee46dbb019 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.
(OFBIZ-9681)

Thanks Julian Leichert for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811438 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 15:47:59 +00:00
Michael Brohl cf3081a277 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.preferences.
(OFBIZ-9640)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811433 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:51:43 +00:00
Michael Brohl a7beb48720 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.uom.
(OFBIZ-9634)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811428 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:12:51 +00:00
Michael Brohl 2a66a06aef Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.qrcode.
(OFBIZ-9633)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811427 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:10:50 +00:00
Michael Brohl 404139505e Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.period.
(OFBIZ-9631)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811426 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:08:49 +00:00
Michael Brohl 31a2e43496 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.login.
(OFBIZ-9630)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811424 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:06:21 +00:00
Michael Brohl 36492861ee Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.image.
(OFBIZ-9629)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811423 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 14:00:27 +00:00
Michael Brohl 17db653e57 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.email.
(OFBIZ-9628)

Applied modified patch due to intermediate changes and removed an
obsolete import.

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811422 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 13:56:48 +00:00
Michael Brohl 2921eff056 Improved: Fixing defects reported by FindBugs, package
org.apache.ofbiz.common.authentication.
(OFBIZ-9627)

Thanks Dennis Balkir for reporting and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1811421 13f79535-47bb-0310-9956-ffa450edef68
2017-10-07 13:49:20 +00:00
Deepak Dixit 259a585512 Fixed: Manually changed the date locale js for cs locale
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809413 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 12:39:52 +00:00
Deepak Dixit 344e97909a Fixed: JsLanguageFilesMapping.java location in createJsLanguageFileMapping service, and commiting the auto generated java file for language mapping js.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809410 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 12:11:31 +00:00
Deepak Dixit 88493836bc Improved: Moved jquery related js/plugins from images to common-theme webapp and made changes accordinlgy. (OFBIZ-5776)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809389 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 10:41:28 +00:00
Jacques Le Roux 15cc03f9c0 Improved: CommonEvents improvements
(OFBIZ-9673)

Reverts r1807045. There is no justification to remove private for "no modifier"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1807142 13f79535-47bb-0310-9956-ffa450edef68
2017-09-03 12:43:15 +00:00
Jacques Le Roux db7448fdfb Improved: CommonEvents improvements
(OFBIZ-9673)

Replaces private to protected so that CommonEvents.java is more usable to 
derived classes.

Thanks: Wai

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1807045 13f79535-47bb-0310-9956-ffa450edef68
2017-09-02 12:25:13 +00:00
Nicolas Malin db7872484c Fixed: Missing to use the modelTheme for the attached screen on email (OFBIZ-9138 Create a common theme)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806815 13f79535-47bb-0310-9956-ffa450edef68
2017-08-31 15:39:29 +00:00
Nicolas Malin b15e57df9b Fixed: correct JsLanguageFilesMapping template path from framework/common to common-theme (OFBIZ-9138 Create a common theme)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806812 13f79535-47bb-0310-9956-ffa450edef68
2017-08-31 15:15:25 +00:00
Deepak Dixit 90181172a1 Fixed: Updated images component reference path, as we removed images component and now these files are part of common-theme componnet.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806273 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 08:30:02 +00:00
Nicolas Malin 0b33186d6f Fixed: Correct library ftl call to render the email body (OFBIZ-9138 Create a common theme)
add possibility to call the ThemeFactory.resolveTheme() with empty request if the visualTheme normaly present on the service context isn't found, so we return the default theme define in general.properties
Thanks to Jacques for raise this problem

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806237 13f79535-47bb-0310-9956-ffa450edef68
2017-08-25 21:25:26 +00:00