Commit Graph
1568 Commits
Author SHA1 Message Date
Taher A. Alkhateeb 609c7d37e3 Improved: minor refactoring to remove miscellanous warnings
Minor code cleanup to remove:
- unused private variables
- unused imports
- improper object castings



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1802172 13f79535-47bb-0310-9956-ffa450edef68
2017-07-17 16:59:18 +00:00
Deepak Dixit e95c7eb261 Fixed: fix tag "disable-if-empty" in menus if field has no value (OFBIZ-9377)
Thanks Gaudin Pierre and Humera Khan for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801336 13f79535-47bb-0310-9956-ffa450edef68
2017-07-08 22:54:06 +00:00
Michael Brohl a78998ce47 Fixed: wrong assignment of the "default-hide-if-selected" attribute.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1801209 13f79535-47bb-0310-9956-ffa450edef68
2017-07-07 20:26:40 +00:00
Jacques Le Roux 2d409ff0e2 No functional change
Just comments about EntityListIterator usage in Paginator class. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1798599 13f79535-47bb-0310-9956-ffa450edef68
2017-06-13 13:28:04 +00:00
Jacques Le Roux 2929627451 Improved: EntityListIterator closed but not in case of exception
(OFBIZ-9385)

This is an improvement only because no cases were reported. But obviously in 
case of unlucky exception after the EntityListIterator creation and before it's 
closed the EntityListIterator remains in memory. 
It should be closed in EntityListIterator.finalize() but the less happens there 
the better.

The solution is to use try-with-ressources when possible

This completes OFBIZ-9385, there are no other cases left.

There are few methods like FindServices.executeFind() or performFindParty 
service which can't be improved because they return an EntityListIterator. 
So methods using them must be carefully crafted to close the EntityListIterator. 
Most where already documented (in the framework). I completed few in 
applications at r1798495  




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1798566 13f79535-47bb-0310-9956-ffa450edef68
2017-06-13 08:29:28 +00:00
Deepak Dixit d345ecf8e5 Improved: Made formName filed optional in renderDateTimeField macro, as this field is not required for all the cases, Only if user define an filed outside of form and want to submit it with form then only we need to use renderDateTimeField formName field. (OFBIZ-9380)
Thanks Chuck Kosta for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1796262 13f79535-47bb-0310-9956-ffa450edef68
2017-05-26 09:19:29 +00:00
Jacques Le Roux f2e9b9eeed Implemented: Add support for 'set-if-null' and 'set-if-empty' attributes on
screens for set element.
(OFBIZ-9251)

As stated in the discussion:
http://ofbiz.markmail.org/thread/hembr4hiabgwr7cs

"set-if-null" controls if field can be set to null and "set-if-empty" controls 
if field can be set to an empty value. Both these attributes are supported by 
"set" element of simple-method and similar support should be there on the screen.

jleroux: I fixed "if" formatting and added default="true" in widget-common.xsd

Thanks: Aditya Sharma

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1794513 13f79535-47bb-0310-9956-ffa450edef68
2017-05-09 09:33:52 +00:00
Jacques Le Roux 9f8f5d52db No functional change, forgot resultMapNameAcsr as param in the Javadoc
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1789738 13f79535-47bb-0310-9956-ffa450edef68
2017-03-31 19:40:00 +00:00
Jacques Le Roux b912d34c8f Improved: Refactor the runAction method in AbstractModelAction, ModelFormAction
and ModelTreeAction classes
(OFBIZ-9287)

This 3 methods share a pattern which should be refactored in a common protected
 method. The pattern is
{code}
if (!this.resultMapNameAcsr.isEmpty()) {
    this.resultMapNameAcsr.put(context, result);
    String queryString = (String) result.get("queryString");
    context.put("queryString", queryString);
    context.put("queryStringMap", result.get("queryStringMap"));
    if (UtilValidate.isNotEmpty(queryString)) {
        try {
            String queryStringEncoded = queryString.replaceAll("&", "%26");
            context.put("queryStringEncoded", queryStringEncoded);
        } catch (PatternSyntaxException e) {
         // obviously a PatternSyntaxException should not occur here
        }
    }
} else {
    context.putAll(result);
}
{code}
Enough for a refactor I'd say.

I created a ModelActionUtil class where I extracted the method I used in the 3
other classes.

This also removes the swallowed exception that we had in ModelFormAction and 
ModelTreeAction, but not in ModelActionUtil from where I extracted the method.
It's now consistent and if ever, for a very unlikely reason, the exception 
is thrown, people will know about it and will take appropriate measures.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1789737 13f79535-47bb-0310-9956-ffa450edef68
2017-03-31 19:37:00 +00:00
Jacques Le Roux 0cddec3a01 Fixed: Fix Default or Empty Catch block in Java files
(OFBIZ-8341)

Obviously a PatternSyntaxException should not occur there. 
So I simply put a comment to document the fact even it it seems obvious.

I note though that the repeated pattern is a smell for refactoring...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1789163 13f79535-47bb-0310-9956-ffa450edef68
2017-03-28 15:26:02 +00:00
Jacques Le Roux 6572f0ceb0 Completed: Missing reference to the delegator in HtmlFormMacroLibrary.ftl
(OFBIZ-9230)

No functional changes, completes r1785882. I missed the other macro types which 
don't implement these macros

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1785925 13f79535-47bb-0310-9956-ffa450edef68
2017-03-08 08:21:49 +00:00
Jacques Le Roux 9b2209ef5d Fixed: Missing reference to the delegator in HtmlFormMacroLibrary.ftl
(OFBIZ-9230)

This has been temporarily fixed with r1784259. After a discussion on dev ML and
a code analysis reported in the Jira issue, I decided to follow Rishi Solanki's 
idea of using the delegatorName.

Since we have no context when executing a macro in the widget form, I decided 
to pass it to the macro. I had though to create an 
EntityUtilProperties.getPropertyValueFromDelegatorName() method to eventually 
pass the delegatorName. Two macros were concerned renderLookupField and 
renderTextField.

Note: while analysing the code I found that EntityExpr.checkRhsType() can face
a related kind of problem. I'll commit an improvement later...

Thanks: Wai for report and discussion and Rishi for pursuing his idea of using 
the delegatorName

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1785882 13f79535-47bb-0310-9956-ffa450edef68
2017-03-07 20:33:09 +00:00
Jacques Le Roux 75d4db8c94 No functional change, just a comment
context is always null here. It misled me , so I prefer to put a comment


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1785865 13f79535-47bb-0310-9956-ffa450edef68
2017-03-07 18:43:39 +00:00
Jacques Le Roux 70fc173a0d No functional changes, code cleaning
While working on OFBIZ-9230 I noticed those needed changes



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1785861 13f79535-47bb-0310-9956-ffa450edef68
2017-03-07 17:11:35 +00:00
Jacques Le Roux 084c4fd9db No functional changes
completes r1781219 by putting svn:eol-style=native to all file types declared 
in [auto-props] section of the svn config files.css

Actually this is only a 1st pass, it was too complicated to do it for  
all file types at once only concerned here
*.java;*.bsh;*.groovy;*.jsp;*.tld;*.ftl;*.js;*.sql;*.c;*.cpp;*.h;*.txt;*.sgml;
*.properties;*.xml;.classpath;.project;*.sld;*.gml;*.xsl;*.xsd
*.html;*.htm;*.css;*.md;README;NOTICE;LICENSE;rc.ofbiz.*;*.less;*.dsp;*.dsw

Most files should not be concerned by this change, but it's impossible to do
it one by one.

There are also changes in files with have mixed EOLs; because this has no sense
when using native which automatically resolves this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1781731 13f79535-47bb-0310-9956-ffa450edef68
2017-02-05 11:09:59 +00:00
Jacques Le Roux b057011c26 No functional change, reverts r1781366
I did not even notice I committed this bunch of WIP stuff. I guess I clicked 
somewhere while my machine was too buzy

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1781367 13f79535-47bb-0310-9956-ffa450edef68
2017-02-02 10:54:06 +00:00
Jacques Le Roux e130654d28 No functional change, this was reverted in r1781367
I did not even notice I committed this bunch of WIP stuff. I guess I clicked 
somewhere while my machine was too buzy



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1781366 13f79535-47bb-0310-9956-ffa450edef68
2017-02-02 10:33:59 +00:00
Jacques Le Roux d26c3318b5 Fixed: Navigate Accounts tree does not work
(OFBIZ-9191)

This is due to a change in (at least) Tomcat 8.0.39

Here is a simple fix. I tried other ways but none worked and I prefer to keep
this simple.
I tried other ways but none worked and I prefer to keep this simple.
* Using an encoder at this stage (just before calling the macro) is not an 
option. Or maybe by using the encoder on the linkurl variable alone. 
But then linkurl  must be transformed in a String and  back to a 
StringBuilder or more refactoring is needed. It does not worth it IMO.
* Also using encode="true" for links in AccountingTrees.xml does not work.

This also removes trailing blanks (by hand)

Thanks: Moatasim Al Masri for report


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1781125 13f79535-47bb-0310-9956-ffa450edef68
2017-01-31 17:24:01 +00:00
Jacques Le Roux b81851a6ab No functional change, only this test is concerned, more a bug fix though.
Despite missing the creation data in svn, I guess this file has been created 
after I created the portoffset feature or I missed it then (unlikely since I
changed all 8080 and 8443 ports in Java code). 

Anyway, we now need this to be portoffset aware and this commit just does that

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1780659 13f79535-47bb-0310-9956-ffa450edef68
2017-01-28 11:19:34 +00:00
Jacques Le Roux a019a3e257 No functional change, removes unused local delegator variables
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1778880 13f79535-47bb-0310-9956-ffa450edef68
2017-01-15 06:25:33 +00:00
Jacques Le Roux f9cfdd5880 No functional change, only formatting and imports cleaning
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1777446 13f79535-47bb-0310-9956-ffa450edef68
2017-01-05 11:13:28 +00:00
Jacques Le Roux 409d76ba07 Improved: Refactor ContentWorkerInterface methods signatures
(OFBIZ-9164)

While working on OFBIZ-6919 which was built on R13.07 I stumbled upon an issue 
due to r1652852 where Adrian improved the cacheKey in 
FormFactory.getFormFromLocation() by adding a delegator reference (Tenants). 

Actually I'm not even sure it was done at r1652852 because Adrian did not 
maintain the FormFactory svn history.

Anyway, to make a long story short I had to introduce a DispatchContext 
parameter when calling FormFactory.readFormDocument() when the code from 
R13.07 only passed a null.

This had an impact in the hierarchy tree because FormFactory.readFormDocument() 
was called in DataResourceWorker class, where the new code was called 
from renderDataResourceAsText(). 

So I instead of only passing a Delegator I decided to pass only a 
LocalDispatcher parameter in renderDataResourceAsText(), since we can get the 
Delegator  from the LocalDispatcher. Doing so it had an impact on the 
renderDataResourceAsText hierarchy tree ending in DataResourceWorkerInterface 
and all related.

I finally decided to apply the same "Change Method Signature" refactoring 
pattern (http://refactoring.com/catalog/addParameter.html) to all cases 
related to ContentWorkerInterface. No need to pass a delegator when you have 
LocalDispatcher!

Since last commit and revert I fixed 5 test failures and improved the code more,
 mostly formatting, comments, etc.

There are very ugly method signatures out there which still need refactoring,
but it's so much work...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1777297 13f79535-47bb-0310-9956-ffa450edef68
2017-01-04 12:48:11 +00:00
Jacques Le Roux e59c71db8b Reverted:Merged revision(s) 1777145 from ofbiz/trunk:
Improved: Refactor ContentWorkerInterface methods signatures
(OFBIZ-9164)

While working on OFBIZ-6919 which was built on R13.07 I stumbled upon an issue 
due to r1652852 where Adrian improved the cacheKey in 
FormFactory.getFormFromLocation() by adding a delegator reference (Tenants). 

Actually I'm not even sure it was done at r1652852 because Adrian did not 
maintain the FormFactory svn history.

Anyway, to make a long story short I had to introduce a DispatchContext 
parameter when calling FormFactory.readFormDocument() when the code from 
R13.07 only passed a null.

This had an impact in the hierarchy tree because FormFactory.readFormDocument() 
was called in DataResourceWorker class, where the new code was called 
from renderDataResourceAsText(). 

So I instead of only passing a Delegator I decided to pass only a 
LocalDispatcher parameter in renderDataResourceAsText(), since we can get the 
Delegator  from the LocalDispatcher. Doing so it had an impact on the 
renderDataResourceAsText hierarchy tree ending in DataResourceWorkerInterface 
and all related.

I finally decided to apply the same "Change Method Signature" refactoring 
pattern (http://refactoring.com/catalog/addParameter.html) to all cases 
related to ContentWorkerInterface. No need to pass a delegator when you have 
LocalDispatcher!

I locally got 5 incomprehensible test failures. After checking as much as I can
w/o committing I believe it's a Windows 7 issue only. Anyway if Buildbot reports
the same I'll revert. I need this changes in to continue on another not yet 
created subtask of OFBIZ-6919 
........


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1777154 13f79535-47bb-0310-9956-ffa450edef68
2017-01-03 16:14:29 +00:00
Jacques Le Roux 8ff0fe3a74 Improved: Refactor ContentWorkerInterface methods signatures
(OFBIZ-9164)

While working on OFBIZ-6919 which was built on R13.07 I stumbled upon an issue 
due to r1652852 where Adrian improved the cacheKey in 
FormFactory.getFormFromLocation() by adding a delegator reference (Tenants). 

Actually I'm not even sure it was done at r1652852 because Adrian did not 
maintain the FormFactory svn history.

Anyway, to make a long story short I had to introduce a DispatchContext 
parameter when calling FormFactory.readFormDocument() when the code from 
R13.07 only passed a null.

This had an impact in the hierarchy tree because FormFactory.readFormDocument() 
was called in DataResourceWorker class, where the new code was called 
from renderDataResourceAsText(). 

So I instead of only passing a Delegator I decided to pass only a 
LocalDispatcher parameter in renderDataResourceAsText(), since we can get the 
Delegator  from the LocalDispatcher. Doing so it had an impact on the 
renderDataResourceAsText hierarchy tree ending in DataResourceWorkerInterface 
and all related.

I finally decided to apply the same "Change Method Signature" refactoring 
pattern (http://refactoring.com/catalog/addParameter.html) to all cases 
related to ContentWorkerInterface. No need to pass a delegator when you have 
LocalDispatcher!

I locally got 5 incomprehensible test failures. After checking as much as I can
w/o committing I believe it's a Windows 7 issue only. Anyway if Buildbot reports
the same I'll revert. I need this changes in to continue on another not yet 
created subtask of OFBIZ-6919 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1777145 13f79535-47bb-0310-9956-ffa450edef68
2017-01-03 15:37:25 +00:00
Jacopo Cappellato 1b9f6eba44 Implemented: a set of unit tests for the
ExternalLoginKeysManager.getExternalLoginKey(...) method.

Minor refactoring of the getExternalLoginKey(...) method to make it more 
friendly to unit tests.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1776138 13f79535-47bb-0310-9956-ffa450edef68
2016-12-27 14:29:37 +00:00
Jacopo Cappellato ebac046aef Improved: moved the logic/implementation of OFBiz legacy authentication
tokens from the LoginWorker class to a new class named ExternalLoginKeysManager.

Improved Javadocs in the new class.
 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1775807 13f79535-47bb-0310-9956-ffa450edef68
2016-12-23 09:35:26 +00:00
Taher A. Alkhateeb 71f512a0d2 Improved: refactor javadocs in OFBiz to be standards compliant
(OFBIZ-9144)

This is the first commit to the above mentioned issue which fixes many javadoc
errors dispersed through the different components. The fixes are not
necessarily improvements to the javadocs but rather making them valid javadocs
to prevent reporting errors from gradle


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1774154 13f79535-47bb-0310-9956-ffa450edef68
2016-12-14 09:22:32 +00:00
Jacopo Cappellato 262e87f79e Fixed: form macros with incorrect arguments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1773337 13f79535-47bb-0310-9956-ffa450edef68
2016-12-09 08:47:41 +00:00
Deepak Dixit 05b1f9cb81 Fixed: layered-modal hyperlink doesn't show style
(OFBIZ-7323)


Thanks Pierre Smits for reporting the issue.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1770490 13f79535-47bb-0310-9956-ffa450edef68
2016-11-19 12:03:36 +00:00
Divesh Dutta 8e8272b4fa Improvement: Generic value is null or not should be checked using native checks. Utility method isEmpty or isNotEmpty is not needed to check if generic value is null or not because generic values can never be empty. They can be null or not nulls. So made changes accordingly all over the places.
(OFBIZ-8471)

Thanks: Ratnesh Upadhyay for reporting the improvement and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768192 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 11:27:46 +00:00
Arun Patidar 80498ef38d Implemented: Refer to objects by their interfaces rather than class when instantiating Collection implementation classes in Java files
(OFBIZ-9023) (OFBIZ-9026)(OFBIZ-9027)(OFBIZ-9032)(OFBIZ-9034)(OFBIZ-9036)(OFBIZ-9030)

Thanks: Divesh Dutta, Amit Gadaley and Shubham Agrawal for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768189 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 11:16:49 +00:00
Arun Patidar 3521a331b7 Fixed: Catch GenericEntityException and GenericServiceException and other instead of Exception in Java classes.
(OFBIZ-8909)(OFBIZ-8910)(OFBIZ-8911)(OFBIZ-8912)(OFBIZ-8913)(OFBIZ-8914)(OFBIZ-8915)(OFBIZ-8917)(OFBIZ-8918)(OFBIZ-8919)(OFBIZ-8920)(OFBIZ-8921)(OFBIZ-8922)

Thanks: Divesh Dutta for reporting and Amit Gaadaley for providing patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768168 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 09:30:07 +00:00
Arun Patidar 80e3f8ec12 Fixed: Page bottom navigation problem with grid and include-grid
(OFBIZ-7648)

Thanks: Rohit Koushal and Rishi Solanki for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1768150 13f79535-47bb-0310-9956-ffa450edef68
2016-11-05 05:08:16 +00:00
Deepak Dixit b150af15ea Improved: UtilValidate isEmpty and isNotEmpty methods not used correctly
(OFBIZ-8413)

Thanks Pawan Verma for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1766868 13f79535-47bb-0310-9956-ffa450edef68
2016-10-27 19:21:41 +00:00
Jacques Le Roux b0b7c65c0e Reverted: Can't find Company and admin in Party find feature
(OFBIZ-8505)

Reverts r1765058 + r1765080 following discussion on dev ML

This was introduced for this improvement: In form widgets of list type empty 
header row should not render if list to render in file is empty for OFBIZ-7598

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1766080 13f79535-47bb-0310-9956-ffa450edef68
2016-10-21 17:31:37 +00:00
Arun Patidar 6e4da8fc88 Fixed: Compilation error due to r1765058.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1765080 13f79535-47bb-0310-9956-ffa450edef68
2016-10-15 14:52:34 +00:00
Mridul Pathak 76fcb2f49a Improved: In form widgets of list type empty header row should not render if list to render in file is empty.
(OFBIZ-7598)

Thanks: Suraj Khurana for contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1765058 13f79535-47bb-0310-9956-ffa450edef68
2016-10-15 13:19:35 +00:00
Jacques Le Roux 7e5a0db5df No functional change, renames files:
conditional.xml to conditionalLabels.xml
DefaultMessages.xml to DefaultMessagesLabels.xml
EmailPassword.xml to EmailPasswordLabels.xml
Found while working on OFBIZ-8321

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1764261 13f79535-47bb-0310-9956-ffa450edef68
2016-10-11 14:56:49 +00:00
Jacopo Cappellato b84345831b Improved: cleanups and enhancements in the FreeMarkerWorker class, and client
code using it, that wraps most of the OFBiz integration with FreeMarker.

This is the list of the main modifications:
* simplified and cleaned up the public methods of FreeMarkerWorker, used to 
retrieve and render Freemarker templates and changed client code accordingly to 
use them
* removed unused methods in FreeMarkerWorker and made some others private
* improved the integration code in FreeMarkerWorker to better use the Freemarker 
API and specifically to leverage the various TemplateLoaders and the Freemarker 
caching mechanism; it is now possible to switch the OFBiz legacy template 
caching mechanism to use the Freemarker one instead
* improved the implementation of Freemarker template rendering from strings 
(used by DataResourceWorker): it now leverages the Freemarker's 
StringTemplateLoader that provides the ability to cache the strings, retrieved 
from DataResources records, based on the timestamp of the last modification
* moved freemarkerImports.properties from "widget" to "base" component, and 
changed its content (and the content of the associated templates 
AutoImportTemplate.ftl and HtmlTemplate.ftl) to remove the dependency from base 
to widget&common; some resources of "widget" and "common" are still referenced 
from AutoImportTemplate.ftl (that is in "base") but even if they are soft 
dependencies: if they are missing the system will load properly without any 
error or warning; before this change it was impossible to use, or unit test, 
FreeMarkerWorker before the "widget" and "common" components were loaded by the 
system, now it is possible
* created a new class for unit tests for FreeMarkerWorker, named 
FreeMarkerWorkerTests: at the moment it contains just one simple unit test but 
more should be implemented
* refactored WebToolsServices.entityImport(...) to leverage the 
FreeMarkerWorker.renderTemplate(...) method to run the Freemarker template, 
rather than dealing with the Freemarker API directly; this is now possible 
thanks to the cleanups and improvements done in the FreeMarkerWorker class; this 
same approach should be implemented for a few other similar integration points 
(mostly in the "content" component); this is a TODO item
* moved the encodeDoubleQuotes(...) method from FreeMarkerWorker to 
MacroFormRenderer and made it private since this is the only calss using it and 
its logic is not related to FreeMarker



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762227 13f79535-47bb-0310-9956-ffa450edef68
2016-09-25 17:20:58 +00:00
Jacques Le Roux 9459de41f1 Fixes: Sorting of lists generates undesired results
(OFBIZ-8302)

This was due to r1759555 has Scott spotted on. r1759555 fixed a vulnerability 
but as explained in r1759555 commit message we used
>2 redundant mechanisms (better safe than sorry):
>1) linkUrl = URLEncoder.encode(linkUrl, "UTF-8");
>2) sr.append("\" linkUrl=r\"");

Removing the 1st way fixes the reported issue and we are still safe.

I'll have a look at how the catalog/control/FindProduct URL is generated to be 
sure it's OK as is

Thanks: Pierre for report, Scott for spotting the issue.

[CVE-2016-4462] OFBiz template remote code vulnerability
By manipulating the URL parameter externalLoginKey, a malicious, logged in
user could pass valid Freemarker directives to the Template Engine that are
reflected on the webpage; a specially crafted Freemarker template could be
used for remote code execution.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761978 13f79535-47bb-0310-9956-ffa450edef68
2016-09-22 16:52:56 +00:00
Jacques Le Roux 615c18cb0f Improves: Adds a small sentence saying to look before for a possible
FormFieldTitle_ in the autocompletion help when creating a form widget title


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761975 13f79535-47bb-0310-9956-ffa450edef68
2016-09-22 16:14:35 +00:00
Jacques Le Roux 5b002a5953 Fixes: jquery.jgrowl.min.css is linked twice in html page
(OFBIZ-7758)

I am running on trunk rev 1751489 on tomahawk theme. 
In the browser, right-click and view the page source. 
There is duplicate linking of jquery.jgrowl.min.css i.e.

<link rel="stylesheet" href="/images/jquery/plugins/jquery-jgrowl/1.4.1/jquery.jgrowl.min.css" type="text/css"/>

The solution is to remove a hack for JPublish in fex Java classes 
and related changes (mostly "page." in ftl and xml files)

Thanks: Rohit Koushal for the path and James Yong the report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1761235 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 13:43:16 +00:00
Jacques Le Roux 0ee80218e2 Fixes a vulnerability in the form widget sort-order element
By manipulating the UL parameter externalLoginKey it is possible to pass  valid Freemarker directives to the Template Engine that are reflected on the webpage
With Freemarker it is possible to create and use Java classes that implement the TemplateModel, including the freemarker.template.utility.Execute class
An attacker can pass arbitary commands via this class, which are executed on the server. 

This fixes it using 2 redundant mechanisms (better safe than sorry):
1) linkUrl = URLEncoder.encode(linkUrl, "UTF-8");
2) sr.append("\" linkUrl=r\"");

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759555 13f79535-47bb-0310-9956-ffa450edef68
2016-09-07 07:42:45 +00:00
Divesh Dutta 08db5125a1 [OFBIZ-7724] Fixed: System allows to change status from cancel to empty for return and allow-empty flag of form widget does not honour to add or not empty option field in drop-down. Thanks Ankush for reproting and fixing this issue.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759331 13f79535-47bb-0310-9956-ffa450edef68
2016-09-05 16:39:15 +00:00
Deepak Dixit 81ccd9b1f5 (OFBIZ-8050) Applied patch from jira issue
=================================
No need to show "---" after selecting any option from drop-down in Find Screens.
=================================
Thanks Renuka for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759018 13f79535-47bb-0310-9956-ffa450edef68
2016-09-02 19:19:25 +00:00
Jacques Le Roux 2fa71d7972 Reverts changes which slipped in inadvertently, thanks to Jacopo on dev ML DhlServices.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758779 13f79535-47bb-0310-9956-ffa450edef68
2016-09-01 14:16:34 +00:00
Jacques Le Roux dabe53062b A patch from Pierre Smits for "Maximise the utilisation of the Label CommonStatus in various ecommerce forms" https://issues.apache.org/jira/browse/OFBIZ-8102
There are forms in the ecommerce component referencing the status. This issue is about applying the CommonLabel label where it is possible in these forms.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1758774 13f79535-47bb-0310-9956-ffa450edef68
2016-09-01 13:34:17 +00:00
Deepak Dixit 723d277ff3 (OFBIZ-7978) Applied patch from jira issue
================================
Client side required field validation is not working for password type field
================================
Thanks Deepak and Renuka for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1757992 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 11:29:26 +00:00
Ashish Vijaywargiya 5d7ec810de Applied patch from jira issue - OFBIZ-7819. Empty link icon shown in Search results of Find screens.
Thanks Akshay for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1757990 13f79535-47bb-0310-9956-ffa450edef68
2016-08-27 11:08:52 +00:00
Jacques Le Roux ef7996c983 Fixes "Remove warnings regarding missing component lib folders" - https://issues.apache.org/jira/browse/OFBIZ-7776 - by cleaning/clearing the references to non existent/empty dirs.
Notes: 
* Also removes empty framework/base/lib/scripting and useless applications\content\lib\uno\README (miss doc in wiki)
* When jpim-0.1.jar will be (hopefully) replaced we can drop lib ref in framework/base/ofbiz-component.xml
* I wonder if we should let the geronimo component alone with only 2 classes, could we not put that in entity or entityext?
 
    



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1755306 13f79535-47bb-0310-9956-ffa450edef68
2016-08-05 12:27:21 +00:00