Commit Graph
1568 Commits
Author SHA1 Message Date
James Yong b18dd6a9ce Improved: Show border and file name for content rendered from ftl (OFBIZ-12002)
To reduce the need to view the page source from the browser.
Activated when print.verbose=true and widget.verbose=true.

Thanks: Jacques for review
2020-09-12 20:10:08 +08:00
Suraj Khurana 97b1688b0d 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 review.
2020-09-12 12:05:16 +05:30
James Yong 8c4a19118d Refactor ThemeFactory.java 2020-09-11 20:14:58 +08:00
James Yong 161c0c0c05 Improved: Well-formed html in ftl template (OFBIZ-11996)
refactoring + add test case
2020-09-10 17:12:36 +08:00
James Yong aab02b5142 Improved: Well-formed html in ftl template (OFBIZ-11996)
Add code to check closing tags and refactoring
2020-09-10 13:10:32 +08:00
James Yong cac8c27477 Improved: Allow <html-template> to accept CDATA (OFBIZ-7004)
Fix cvc-complex-type.2.1 error
2020-09-10 10:13:28 +08:00
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
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
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
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 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
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
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 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
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
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 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
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
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
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
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
Suraj Khurana f4f2722d36 Improved: Updated case indentation to 0 for all switch statements in framework component. Also done formatting changes as per checkstyle best practices.
(OFBIZ-11904)
2020-07-25 13:50:37 +05:30
Suraj Khurana 7b251e43d9 Improved: Corrected some single line statements to fix checkstyle issues, also removed some remaining extra spaces from code to avoid checkstyle erros in framework component.
(OFBIZ-11886)
2020-07-21 12:25:20 +05:30
Suraj Khurana 8b1e0dbd85 Improved: Corrected all checkstyle formatting issues: 'typecast' is not followed by whitespace in framework component.
(OFBIZ-11887)
2020-07-18 12:26:42 +05:30
Suraj Khurana 0c37e80036 Improved: Corrected all checkstyle formatting issues: Line has trailing spaces in framework component.
(OFBIZ-11880)
Thanks Jacques for review.
2020-07-13 14:18:24 +05:30
Suraj Khurana dd4da77d76 Improved: Corrected checkstyle formatting issues, 'is preceded/not preceded with whitespace' for framework component.
(OFBIZ-11874)
This fixes following checkstyle issues:
'{' is not preceded with whitespace.
'{' is not followed by whitespace.
'}' is not followed by whitespace.
'}' is not preceded with whitespace.
'typecast' is not followed by whitespace.
'try' is not followed by whitespace.
';' is preceded with whitespace.
2020-07-11 14:33:47 +05:30
Suraj Khurana 3bb22302c7 Improved: Corrected all checkstyle issues related to succeeding space for comma in framework directory.
(OFBIZ-11805)
Thanks Jacques and Ritesh Kumar for review.
2020-07-09 12:07:29 +05:30
Suraj Khurana a38fa69e57 Improved: Corrected typo in license header text in ModelActionVisitor.java, ModelConditionVisitor.java and ModelFieldVisitor.java. While working on some checkstyle issues, I found this typo. 2020-07-08 11:12:07 +05:30
Suraj Khurana 4f53828bea Improved: Corrected all 'if is not followed by whitespace' checkstyle errors. Also corrected few ', is not followed by whitespace' checkstyle errors in framework component.
(OFBIZ-11805)
Thanks Jacques Le Roux and Ritesh Kumar for review.
2020-07-06 15:29:58 +05:30
Daniel Watford 3bc59aeb14 Improved: Added new MacroFormRenderer unit tests (OFBIZ-11456) (#213)
Improved: Suppress deprecation warning on test method used to ensure behaviour is preserved until the deprecated method is removed. (OFBIZ-11456)

* Improved: Unit Tests for MacroFormRenderer

As part of refactoring MacroFormRender, unit tests have been created for
the main render methods to help ensure consistent behaviour is
maintained when MacroFormRender is changed.

More in-depth unit testing may be added when the more complex parts of
MacroFormRenderer are modified in the future.
2020-07-03 09:31:21 +02:00
Jacques Le Roux b1e48eef37 Improved: makes ScreenFopViewHandler::render debug area also usable on Windows 2020-06-29 11:47:23 +02:00
Pawan Verma e19b12eae9 Improved: Replace explicit type argument with diamond operator(OFBIZ-11828)
Since Java 1.7, when defining generic types it is unnecessary to redefine those types in the constructor when it is already done in the declared type.
2020-06-28 01:04:51 +05:30
Pawan Verma 4275825b4a Improved: Replace anonymous types with lambda expressions(OFBIZ-11833) 2020-06-24 14:11:05 +05:30
James Yong 4dbdf720c5 Fixed: Apply multi-block attr to each application (OFBIZ-11706)
Rendering screen within freemarker template not done correctly when multi-block=true

Thanks: Jacques for reporting
2020-06-19 23:09:17 +08:00
James Yong 3a13afe811 Fixed: showHelp not working (OFBIZ-11803)
Cater for page that uses layoutSettings.VT_STYLESHEET
instead of layoutSettings.styleSheets
2020-06-18 23:29:02 +08:00
James Yong 33deb94501 Improved: Allow definition of external style sheet in multi-block html template (OFBIZ-11819)
External style sheet in html template will be extracted to layoutSettings.styleSheets when multi-block=true.
2020-06-12 14:12:45 +08:00
James Yong f21dbd6d74 Improved: multi-block attribute for html-template tag (OFBIZ-11686)
Add CSRF token support for 'getJs' request uri.
2020-06-07 14:33:16 +08:00