Commit Graph
10472 Commits
Author SHA1 Message Date
James Yong a8eb8bc059 Improved: Allow <html-template> to accept CDATA (OFBIZ-7004)
Allow inline content

Thanks: Jacques for review in 2016
2020-09-10 09:12:05 +08:00
Jacques Le Roux 5d8541ebf8 Fixed: Checkstyle, variable must be private and have accessor methods (OFBIZ-11963)
Removes RESOURCE, not used anywhere
Replaces keyseparator by KEY_SEPARATOR in Groovy files that use it

We need to be careful about Groovy files that use variables. At least Eclipse
Grooby plugin is not able to check that in an easy way (ill-names vars are
though underlined)
2020-09-09 15:46:06 +02:00
James Yong d322ae51e3 Improved: Well-formed html in ftl template (OFBIZ-11996)
fix checkstyle issue
2020-09-06 18:26:54 +08:00
James Yong 8cbdb6a225 Improved: Well-formed html in ftl template (OFBIZ-11996)
When print.verbose=true, check for well-formed html in ftl templates to catch programming errors.
2020-09-06 07:44:40 +08:00
Jacques Le Roux 2ee3984c8e Improved: missed and ASL2 header 2020-09-04 11:57:15 +02:00
Suraj Khurana bc5e945ded Improved: Corrected line is longer than 150 characters checkstyle issues in framework component.
(OFBIZ-11921)
Also fixed some other extra space and naming related checkstyle issues observed.
Thanks Jacques for review.
2020-09-04 12:25:12 +05:30
Suraj Khurana ca9fa4fba4 Improved: Corrected line is longer than 150 characters checkstyle issues in framework and applications component.
(OFBIZ-11921)
Also fixed some extra spaces and naming conventions related checkstyle issues.
Thanks Jacques for review.
2020-08-31 19:54:54 +05:30
Jacques Le Roux a7121bff23 Improved: Improves service-eca.xsd documentation (OFBIZ-9994)
Fixes some issues
2020-08-30 18:56:52 +02:00
James Yong 4a03567996 Improved: Allow logging to be disabled for getJs request (OFBIZ-11980)
Hide non-error logs related to getJs request as it doesn't provide meaningful data.

Thanks Jacques for initial review
2020-08-30 21:34:34 +08:00
Akash Jain 66a76ffd5a Improved: Fix Literals comparisons with variable to avoid NPE (OFBIZ-11929)
Thanks, Devanshu Vyas for your contribution.
2020-08-30 17:20:23 +05:30
Jacques Le Roux d534f78c6a Improved: Improves service-eca.xsd documentation (OFBIZ-9994)
Also with formatting
2020-08-30 11:09:10 +02:00
Jacques Le Roux 9b3053de97 Improved: Complete the documentation in the XSD files (OFBIZ-7537)
Small changes in order to close the Jira :)
2020-08-29 19:17:49 +02:00
Jacques Le Roux 0fe413b3fb Improved: Checkstyle: Variable name must match pattern (OFBIZ-11926)
Prevents false warnings like reported at https://s.apache.org/o7tmu
2020-08-28 17:46:54 +02:00
Suraj Khurana f98f5ebb86 Improved: Added missing Javadocs for some methods, this is required for all classes which looks like designed for extension (can be subclassed).
(OFBIZ-11947)
Also fixed some other checkstyle issues that requires re-factoring.
Thanks Jacques for review.
2020-08-28 16:54:15 +05:30
Jacques Le Roux b42cd5f188 Improved: removes unused MODULE var in FreeMarkerViewHandler.java
Also removes empty line in build.gradle
2020-08-28 09:00:36 +02:00
Jacques Le Roux 8276a0802b Improved: Freemarker macro for JsLanguageFilesMapping (OFBIZ-11958)
Adds a missing ASL2 header
2020-08-27 19:34:35 +02:00
Jacques Le Roux 96be0c62a3 Improved: Checkstyle: Variable name must match pattern (OFBIZ-11926)
All final data members of the class must match this naming pattern
'^[A-Z][A-Z0-9](_[A-Z0-9]+)$'

I added the changes in CommonScreens.xml and kept the
private static Map<String, String> localeFiles = new HashMap<>();
expression, instead of
private static Map<String, String> localeFiles = new HashMap<String, String>();
in JsLanguageFilesMapping.ftl

I note that we use JQuery instead of Java conventional Jquery but that sounds OK
with me

Thanks: Suraj for the patch
2020-08-27 19:10:08 +02:00
Girish Vasmatkar a79c6cc3a4 Implemented: Added a new IntegerToBigInteger converter(OFBIZ-11985) 2020-08-27 22:14:43 +05:30
Suraj Khurana 76139dfc72 Merge branch 'trunk' of https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk 2020-08-26 23:48:18 +05:30
Suraj Khurana 58a026fbf8 Fixed: testIntegration issue caused due to mistakenly updated static string 'WITHDRAWAL' and updated variable in groovy test case.
(OFBIZ-11926)
Also used getter method for entity auto tests to get the dispatcher from OFBizTestCase.
2020-08-26 23:47:21 +05:30
Jacques Le Roux 707acc7d27 Improved: makes the top comment more clear 2020-08-26 18:47:06 +02:00
Suraj Khurana f357b997c0 Improved: Corrected class names, method names, data members of class and variables names in framework component.
(OFBIZ-11926)
Also corrected some formatting and line length related checkstyle issues.
2020-08-26 21:40:40 +05:30
James Yong fd85450c4d Improved: multi-block attribute for html-template tag (OFBIZ-11686)
Not important to track server hits for getJs request
2020-08-25 21:59:46 +08:00
James Yong 219fcc01ce Improved: multi-block attribute for html-template tag (OFBIZ-11686)
Increase value for maxScriptCacheSizePerUserSession as ecommerce application using more inline script tags.

Thanks: Jacques for reporting
2020-08-25 20:49:05 +08:00
James Yong 2d18b93a2e Fixed: multi-block attribute for html-template tag (OFBIZ-11686)
checkstyle issues
2020-08-24 07:41:01 +08:00
James Yong 4612e49fa6 Improved: multi-block attribute for html-template tag (OFBIZ-11686)
Remove support to headerize script and css links from html-template
as importLibrary js function is a more simple solution.
2020-08-23 21:55:09 +08:00
girishvasmatkar fdb67aee72 WIP: Implemented: Added support for defining nested attributes.(OFBIZ-11902) (#231)
* Added nested attr definition and code to handle nested attributes

* Checkstyle error fix

* Fixed indentation and tabs issues
2020-08-22 23:50:12 +05:30
Pawan Verma 6cb67c1a40 Improved: Replace .size() == 0 with isEmpty() in Java files(OFBIZ-11944)
Thanks, priya for the report and patch and jacques for the review.
2020-08-22 19:17:10 +05:30
Suraj Khurana 9689201b84 Improved: Make data members of class as private and added accessor methods for the same, also corrected occurences of the same in framework component.
(OFBIZ-11963)
Also made some related checkstyle code enhancements.
Thanks jacques for finalizing Javadoc pattern during this effort.
2020-08-22 13:20:39 +05:30
Jacques Le Roux 3c687a757c Improved: Form-Fields of certain types won't render IDs (OFBIZ-11957)
While implementing some OFBiz-Forms, I noticed, that certain types of
form-fields will not render the set ID.

Field-Types that won't work for sure are {{submit}} and {{hyperlink}} where the
set name for the parameter {{id-name}} simply will not be rendered in the
HTML-Code that is generated by OFBiz.

Thanks: Dennis Balkir
2020-08-20 15:17:21 +02:00
Jacques Le Roux b80fc9075c Improved: Mark as deprecated ofbiz.locale.default and locale.properties.fallback properties (OFBIZ-11962)
It follows this dev thread: https://markmail.org/message/fzg7qrxgnxgbn65o

Also removes deprecation for EntityUtilProperties::getFallbackLocale
It was copied from UtilProperties::getFallbackLocale I guess
UtilProperties::getFallbackLocale is not deprecated and used in some place
2020-08-18 11:49:01 +02:00
Suraj Khurana 8c10d4ae72 Improved: Added missing Javadocs for some methods, this is required for all classes which looks like designed for extension (can be subclassed).
(OFBIZ-11947)
This is done for framework component. Also corrected some variables as per naming convention best practices.
Thanks Jacques for review.
2020-08-17 12:30:26 +05:30
James Yong 11e958ff8a Improved: multi-block attribute for html-template tag (OFBIZ-11686)
Return 404 response when getJs has no result.
Also remove script from cache after read by getJs.
2020-08-15 22:01:19 +08:00
James Yong 8b2524d4ad Fixed: Freemarker macro for JsLanguageFilesMapping (OFBIZ-11958)
Fix missing type arguments for generic class Map<K,V>
2020-08-15 20:35:46 +08:00
James Yong 49e365d9a2 Improved: Freemarker macro for JsLanguageFilesMapping (OFBIZ-11958)
A macro is needed to get info from JsLanguageFilesMapping class.
<@jsLangFilesMap>select2</@jsLangFilesMap>
2020-08-15 18:42:52 +08:00
Jacques Le Roux 3155906740 Improved: small typo in trunk (OFBIZ-11952)
I also replaced tabs by spaces in applications/product/servicedef/services.xml

Thanks: Alex Bodnaru
2020-08-13 09:16:20 +02:00
James Yong 30065236b1 Fixed: multi-block attribute for html-template tag (OFBIZ-11686)
Fixed regression where 1st of the 2 maps failed to render when accessing:
https://localhost:8443/example/control/ExampleGeoLocationPointSet4
https://localhost:8443/example/control/ExampleOsmGeoLocationPointSet4
2020-08-13 14:31:07 +08:00
Priya SharmaandPriya Sharma 9e7df96921 Improved: Move 'SecurityPermission' data to seed data files (OFBIZ-10575) (#225)
Co-authored-by: Priya Sharma <priya.sharma@hotwaxsystems.com>
2020-08-11 16:01:18 +02:00
Jacques Le Roux 7647685621 Improved: multi-block attribute for html-template tag (OFBIZ-11686)
Fixes JavaDoc issues
2020-08-10 11:07:03 +02:00
James Yong cf083f2cbe Improved: multi-block attribute for html-template tag (OFBIZ-11686)
Improved documentation. No code change.
2020-08-10 09:23:50 +08:00
Jacques Le Roux b895a9c889 Improved: Removed unused imports from Java files for fixing checkstyle errors (OFBIZ-11930)
Fixes few javadoc issues

Since this has been ignored for few commits I need to increase
tasks.checkstyleMain.maxErrors from 12224 to 12247 (did not check the detail)
2020-08-08 14:04:08 +02:00
Priya Sharma 5dbf5cb9eb Improved: Removed unused imports from Java files for fixinf checkstyle errors
(OFBIZ-11930)
Thanks: Priya Sharma
2020-08-07 18:57:02 +05:30
James Yong d5140ca65d Improved: Move page-specific script links to html template (OFBIZ-11799)
Moved select2 script and link tags to html template when multi-block=true.
select2 language js will be auto added by MultiBlockHtmlTemplateUtil#addLinksToLayoutSettings

Tested on
https://localhost:8443/example/control/FormWidgetExamples

https://localhost:8443/ordermgr/control/FindRequest
2020-08-06 22:39:59 +08:00
Priya Sharma 3fe72d440f Improved: Remove unused imports from Java files (OFBIZ-11930) (#222)
Improved: Remove unused imports from Java files
(OFBIZ-11930)
Thanks: Priya Sharma
2020-08-06 19:51:09 +05:30
Suraj Khurana 33f05c1684 Improved: Corrected all redundant modifiers occurences in framework component. Also, fixed some other checkstyle line formatting and spacing issues.
(OFBIZ-11925)
2020-08-06 18:53:13 +05:30
Jacques Le Roux e8dd3c609c Fixed: Server-Side Template Injection using Static (OFBIZ-11871)
Thanks to Alvaro's explanations, the problem was in MacroFormRenderer where, for
lookups, we retrieve _LAST_VIEW_NAME_ as a parameter without encoding it.

I have added getEncodedParameter method in UtilHttp and removed now useless
(after OFBIZ-11907) getEnvironment from MacroFormRenderer.java

Thanks: Alvaro for advice
2020-08-03 11:04:58 +02:00
Suraj Khurana 7d82b17c72 Improved: Corrected some line is longer than 150 characters checkstyle issues in framework component. Also fixed some extra spaces and naming conventions related checkstyle issues.
(OFBIZ-11921)
2020-08-03 10:11:40 +05:30
Daniel Watford 9f3e52e7ab Improved: WidgetWorker should not write generated html to Appendable (OFBIZ-11907) (#221)
* Improved: WidgetWorker should not write generated html to Appendable

(OFBIZ-11907)

Refactoring of WidgetWorker so that it generates URI and JSoup Element
objects to represent created URLs, hidden forms and anchor tags. This
replaces the previous approach where WidgetWorker would write string
representations of the URLS, hidden forms and anchor tags directly to an
Appendable object passed to it.

Callers to WidgetWorker have been modified to render the new objects
created by WidgetWorker to their relevant I/O.

* Improved: Handle spaces in link targets when building URIs

(OFBIZ-11907)

Corrected handling of spaces in target values passed to WidgetWorker
when bulding URIs. Spaces are URL encoded as %20.
2020-07-31 19:27:52 +02:00
Jacques Le Roux be498295a5 Improved: Update build.gradle to the latest dependencies (OFBIZ-11603)
Fixes some new warnings coming from JUnit 4.13, a step ahead to JUnit 5.

I left 2 complicated ExpectedException  warnings. Change will be needed for JUnit 5.
https://www.luxoft-training.com/news/migrating-from-junit-4-to-junit-5-replacing-rules-with-the-extension-model-part-1/
2020-07-27 16:14:51 +02:00
Suraj Khurana d374019465 Improved: Corrected all incorrect indentation level issues in framework component, also fixed some case indentation checkstyle issues.
(OFBIZ-11922)
2020-07-26 21:04:41 +05:30