Commit Graph
1568 Commits
Author SHA1 Message Date
Jacques Le Roux e6193df72d Partial improvement for "Remove from trunk the deprecated code if deprecated before December 2014" https://issues.apache.org/jira/browse/OFBIZ-6273
Deletes FoScreenRenderer.java no longer used/needed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737807 13f79535-47bb-0310-9956-ffa450edef68
2016-04-05 09:31:43 +00:00
Jacques Le Roux 6ed0d2e22b Partial improvement for "Remove from trunk the deprecated code if deprecated before December 2014" https://issues.apache.org/jira/browse/OFBIZ-6273
Replaces the deprecated FoScreenRenderer.getFoStyle() by new MacroScreenRenderer.getFoStyle() in Fo form and screen renderers

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737806 13f79535-47bb-0310-9956-ffa450edef68
2016-04-05 09:13:20 +00:00
Jacques Le Roux 01ab6dd9b7 Partial improvement for "Remove from trunk the deprecated code if deprecated before December 2014" https://issues.apache.org/jira/browse/OFBIZ-6273
Replaces the deprecated new HtmlScreenRenderer() in HtmlTreeRenderer.java.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737803 13f79535-47bb-0310-9956-ffa450edef68
2016-04-05 08:57:35 +00:00
Nicolas Malin 2aa9aaf3f4 For screen engine drop-down, sort with the locale the entity-list if the related entity have a default resource defined.
This work also with view entity. Relate issue OFBIZ-3311

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735741 13f79535-47bb-0310-9956-ffa450edef68
2016-03-19 09:01:40 +00:00
Gil Portenseigne d58d3a2fbf OFBIZ-6927
Add width and height attributes retrieval in renderLink method in MacroMenuRenderer. Thanks Pierre for the report.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1735738 13f79535-47bb-0310-9956-ffa450edef68
2016-03-19 08:08:50 +00:00
Deepak Dixit 06dbe2a87c (OFBIZ-5780) Removed deprecated warning from FoFormRender as we don't have support to create MacroFormRender object in services.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731392 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 12:45:19 +00:00
Deepak Dixit 10886a0252 (OFBIZ-5780) Fixed some compilation warning:
- Mark some SecurityFactory method as deprecated 
- Mark FoFormRender as deprecated
- Fixed deprecation warning for PassportUtil class.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731377 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 11:46:08 +00:00
Deepak Dixit 6030811211 (OFBIZ-6281) Replace html widget rendering with Macro widget rendering in framework/widget files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1731366 13f79535-47bb-0310-9956-ffa450edef68
2016-02-20 10:26:25 +00:00
Jacques Le Roux adb90faef8 A modified patch from Pierre Smits for "Replace Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue in .ftl files with EntityUtilProperties variant" https://issues.apache.org/jira/browse/OFBIZ-6884
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue is used in several .ftl files. 

Replaces with EnittyUtilProperties variant where appropriate. 

jleroux: In this is the 2nd commit from the 3rd patch (the 2nd had issues) I fixed 2 "typos" I spotted while reviewing in
  ecommerce/customer/editcontactmech.ftl
  ecommerce/customer/newcustomer.ftl
where "UtilProperties" was not replaced



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729002 13f79535-47bb-0310-9956-ffa450edef68
2016-02-07 18:23:49 +00:00
Jacques Le Roux c19af8a60b Reverts r1728959 because of misc. issues with the patch, see my comment at https://issues.apache.org/jira/browse/OFBIZ-6884
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728961 13f79535-47bb-0310-9956-ffa450edef68
2016-02-07 13:59:41 +00:00
Jacques Le Roux 3a5cc393cf A patch from Pierre Smits for "Replace Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue in .ftl files with EntityUtilProperties variant" https://issues.apache.org/jira/browse/OFBIZ-6884
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue is used in several .ftl files. 

Replaces with EnittyUtilProperties variant where appropriate.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728959 13f79535-47bb-0310-9956-ffa450edef68
2016-02-07 13:18:50 +00:00
Jacques Le Roux fffc684891 Removes all sessionsIds put in URLs - https://issues.apache.org/jira/browse/OFBIZ-6872
We should always use sessionIds in cookies and newer have sessionsIds in URLs. So I will remove all sessionsIds in URLs. There are 2 cases:

* the part related to spiders in RequestHandler
* HtmlFormRenderer.appendExternalLoginKey() (there is also an appendExternalLoginKey method in MacroFormRenderer class but it's not used OOTB)

I also removed some old commented out code in RequestHandler class

There are also many cases where we show the sessionId in logs (using UtilHttp.getSessionId()) I wonder if we should not keep those commented out or change the debug info level. Also HttpSessionEvent.getSession().getId() is directly used in some places for the same purpose (log)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728375 13f79535-47bb-0310-9956-ffa450edef68
2016-02-03 21:09:28 +00:00
Gil Portenseigne 63e01c97f7 OFBIZ-6869 : Add properties in widget.properties, for easy customization of JGrowl alert. Thanks Jacques for the idea
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1728351 13f79535-47bb-0310-9956-ffa450edef68
2016-02-03 19:18:35 +00:00
Ashish Vijaywargiya 6caa828896 Applied patch from jira issue - OFBIZ-6735. Tooltip Calendar field (date or date-time) should not stop when using tab key. Thanks Jacques for creating the issue and thanks Jagpreet for the patch contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1724975 13f79535-47bb-0310-9956-ffa450edef68
2016-01-16 13:47:30 +00:00
Nicolas Malin 6fd3a96ed6 Correct on layered-modal link :
* the uuid string to set as unique layered-modal call method name, error introduce with issue OFBIZ-6707 and raise on the issue OFBIZ-6786 by Wai.
* parameters missing when you call the link from a form because their passed in the url and not with the jquery data set, related to OFBIZ-6803

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1724796 13f79535-47bb-0310-9956-ffa450edef68
2016-01-15 13:17:39 +00:00
Julien Nicolas 305dfee0a4 JIRA-6706 - Correct the widget-style of the itemMenu inheritance for the contained hyperlink
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1720891 13f79535-47bb-0310-9956-ffa450edef68
2015-12-19 09:07:28 +00:00
Nicolas Malin fdb9235b5e Remove an over charge on js function getRequestData() use by layered-modal link call when two links are present on the same page. Related to OFBIZ-6768
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1719868 13f79535-47bb-0310-9956-ffa450edef68
2015-12-14 09:19:37 +00:00
Wei Zhang 60b776e46b OFBIZ-6736 The attribute paginate-style of form widget dose not work
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1717710 13f79535-47bb-0310-9956-ffa450edef68
2015-12-03 04:46:57 +00:00
Nicolas Malin ec00f23292 complete commit r1710727 on OFBIZ-6354 that adding new ftl macros renderFormatHeaderOpen and renderFormatHeaderClose on htmlFromMacroLibrary.ftl. This commit adding these macro on textFormMacroLibrary.ftl, xmlFormMacroLibrary.ftl and csvFormMacroLibrary.ftl. The unit test widgettests now pass without failure
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715756 13f79535-47bb-0310-9956-ffa450edef68
2015-11-23 10:42:55 +00:00
Deepak Dixit c1ba07a466 (OFBIZ-6241) Fixed table-layout="auto" FOP warning. Used table-layout="fixed" to fix the warning.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1715493 13f79535-47bb-0310-9956-ffa450edef68
2015-11-21 10:14:05 +00:00
Jacques Le Roux b32ea9f89f No functional change, completes r1713985: removes superfluous .properties extension from UtilProperties requests (and yes I checked UspsServicesTests ;))
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1714652 13f79535-47bb-0310-9956-ffa450edef68
2015-11-16 19:02:25 +00:00
Jacques Le Roux 50cedb1744 Implements "Improve the way default position and size lookup parameters are set" https://issues.apache.org/jira/browse/OFBIZ-6710
Inspired by Nicolas's recent work on modal-layer windows

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1712520 13f79535-47bb-0310-9956-ffa450edef68
2015-11-04 09:54:34 +00:00
Jacques Le Roux 53a618ce1a Fixes https://issues.apache.org/jira/browse/OFBIZ-6673 "Form layered-modal is not respecting passed (default) width"
Actually this worked perfectly well, I just used size instead of height in the hyperlink definition. Better to not set anything and use default value which are committed uncommented here

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1712411 13f79535-47bb-0310-9956-ffa450edef68
2015-11-03 21:04:03 +00:00
Jacques Le Roux a73de1850c No functional change, removes an useless warning
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711914 13f79535-47bb-0310-9956-ffa450edef68
2015-11-02 09:07:00 +00:00
Jacques Le Roux 109be3c183 Fixes a bug introduced with r1710513 for OFBIZ-6422 and OFBIZ-6423, true can(must) now be used here if performFindList is used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711903 13f79535-47bb-0310-9956-ffa450edef68
2015-11-02 08:17:26 +00:00
Jacques Le Roux ffa71d74ae 3 patches from Christian Carlow for "FOP rendered list form widgets do not work for fields with postition > 0" https://issues.apache.org/jira/browse/OFBIZ-6354
It doesn't work because of the way the renderFormatHeaderRowOpen is called causes the FOP renderer to create more than one <fo:table-header>.

The 1st patch adds renderFormatHeaderOpen and renderFormatHeaderClose to separately generate <fo:table-header> for FOP and <thead> for html.
The 2nd patch adds the new list form widget header methods to the deprecated HtmlFormRenderer needed by EmailServices.java to handle OFBIZ-6360 until replaced with MacroFormRender.
The 3rd patch handles the other FormRenderers FOP, Text, Xml. This issue is still a work in process.

jleroux: there is this  "FIXME: this is an hack to avoid FOP rendering errors for empty lists (fo:table-body cannot be null)" in code



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710727 13f79535-47bb-0310-9956-ffa450edef68
2015-10-27 07:18:01 +00:00
Jacques Le Roux a1a4374359 Reverts r1710527 and r1710528 (was for OFBIZ-6354), thanks to Deepak for warning on dev ML (BuildBot still down but infra is working on it)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710675 13f79535-47bb-0310-9956-ffa450edef68
2015-10-26 18:53:33 +00:00
Jacques Le Roux 4536b7e1a3 A patch from Christian Carlow for "FOP rendered list form widgets do not work for fields with postition > 0" https://issues.apache.org/jira/browse/OFBIZ-6354
This patch adds the new list form widget header methods to the deprecated HtmlFormRenderer needed by EmailServices.java to handle OFBIZ-6360 until replaced with MacroFormRender.

jleroux: completes r1710527  


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710528 13f79535-47bb-0310-9956-ffa450edef68
2015-10-26 08:18:34 +00:00
Jacques Le Roux 9efb447a80 A patch from Christian Carlow for "FOP rendered list form widgets do not work for fields with postition > 0" https://issues.apache.org/jira/browse/OFBIZ-6354
It doesn't work because of the way the renderFormatHeaderRowOpen is called causes the FOP renderer to create more than one <fo:table-header>.

This patch adds renderFormatHeaderOpen and renderFormatHeaderClose to separately generate <fo:table-header> for FOP and <thead> for html.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710527 13f79535-47bb-0310-9956-ffa450edef68
2015-10-26 08:15:45 +00:00
Jacques Le Roux 069c5d51bb Completes schema documentation for override-list-size in case of performFindList use - OFBIZ-6422
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710424 13f79535-47bb-0310-9956-ffa450edef68
2015-10-25 11:13:24 +00:00
Jacques Le Roux 027f037200 A patch from Christian Carlow for "Paginator.getListLimits listSize gets set to viewSize for FindServices.performFindList" https://issues.apache.org/jira/browse/OFBIZ-6422
This patch adds code to Paginator to account for the entryList being instanceOf List and extracts from the context.results object the original listSize.

jleroux, important note from OFBIZ-6423 which depends on OFBIZ-6422: it is necessary to assign a value (true makes sense) to override-list-size attribute so that FormRenderer.renderItemRows sets the lowIndex correctly, because once the results of performFindList are displayed, otherwise pages > 0 are rendered as empty.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710413 13f79535-47bb-0310-9956-ffa450edef68
2015-10-25 05:39:07 +00:00
Jacques Le Roux 37dbfcceb0 A patch from Christian Carlow for "Form widget <auto-fields-entity default-field-type="find"/> does not render range find fields for fixed-point" https://issues.apache.org/jira/browse/OFBIZ-6443
A form widget with auto-entity-fields for OrderItem will render the quantity fields as text find fields but the prices as range find fields. The quantity find field should match the price range find capability.

This patch adds "fixed-point" to the condition that renders RangeFindField for induceFieldInfoFromEntityField, with support RangeFindField rendering for currency-precise fields also.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710177 13f79535-47bb-0310-9956-ffa450edef68
2015-10-23 11:35:29 +00:00
Nicolas Malin adbd19dc0b Make layered-window available in forms and menu (OFBIZ-6327), adding example to use on example form and widget example and set new properties to define defaut layered windows size. Thanks Jacques Leroux for the submission
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706909 13f79535-47bb-0310-9956-ffa450edef68
2015-10-05 19:56:28 +00:00
Deepak Dixit ab6cfacebc (OFBIZ-6212) Fixed accounting report PDF export issue, it was throwing FOP exception. It was due to empty description string, if description is empty then makeHyperlinkString does not call the makeHyperlinkString macro to render the hyper link and due to this fo:table-cell is render without fo:block and its not a valid syntax of fo:table-cell.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706577 13f79535-47bb-0310-9956-ffa450edef68
2015-10-03 13:16:46 +00:00
Jacques Le Roux 73d02547cd A patch from Christian Carlow for "FOP renderer does not support alternate row style" https://issues.apache.org/jira/browse/OFBIZ-6355
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704137 13f79535-47bb-0310-9956-ffa450edef68
2015-09-20 13:48:26 +00:00
Jacques Le Roux e4cfb02613 A patch from Christian Carlow for "FOP renderer doesn't apply title-area-style" https://issues.apache.org/jira/browse/OFBIZ-6356
NotoSans is the defaultFontFamily for FOP and the extra stylings and the font-weight="bold" are not rendered correctly unless changed to another font family

jleroux: this needs clarification, I will ask Christian 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704130 13f79535-47bb-0310-9956-ffa450edef68
2015-09-20 13:42:16 +00:00
Jacques Le Roux 55ea7a66d4 A patch from François Lecomte for "Adding the week number in date picking dropdowns" https://issues.apache.org/jira/browse/OFBIZ-5361
For some users, having the week shown in dropdown calendars is an important thing.
There is an option to show week numbers in the dropdown date picker used by OFBiz. (datetimepicker)
It can be done by adding "showWeek: true," in the datetimepicker calls in framework/widget/templates/htmlFormMacroLibrary.ftl.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1704086 13f79535-47bb-0310-9956-ffa450edef68
2015-09-19 20:01:17 +00:00
Jacques Le Roux 067df90ae1 After r1695126, I found that most of the Java files have svn:eol-style=native. So only 116 Java files were missing svn:eol-style=native. I guess those have been added by committers who are not using the OFBiz svn config file on their machines. So rather than removing svn:eol-style=native, this commits add the property to the files which miss it. Here 116+89=205 files have their svn:eol-style property changed to native.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1695129 13f79535-47bb-0310-9956-ffa450edef68
2015-08-10 16:33:23 +00:00
Jacques Le Roux 1310a182cc Document to makes the changes for OFBIZ-6504 more clear
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693400 13f79535-47bb-0310-9956-ffa450edef68
2015-07-30 09:26:20 +00:00
Jacques Le Roux 9f00d68173 Fixes an issue crossed while checking OFBIZ-6504 - how to Create PDF with password Protected in Ofbiz
There was still an issue in normal (not PDF) mode, I thought I had just to replace \' by void, but I got fooled, because \' already transformed in Unicode characters (&#x5c;&#x27;) at this stage. So I replaced "&#x5c;&#x27;" by "&#x27;"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693258 13f79535-47bb-0310-9956-ffa450edef68
2015-07-29 13:33:12 +00:00
Shi Jinghai 8f3c4a1bda OFBIZ-6504.
In ScreenFopViewHandler.java, removed a line:
            pdfEncryptionParams.setEncryptionLengthInBits(256);
it's redundant to the line
            pdfEncryptionParams.setEncryptionLengthInBits(encryptionLength);


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693243 13f79535-47bb-0310-9956-ffa450edef68
2015-07-29 11:58:48 +00:00
Jacques Le Roux 06a06feb14 Fixes an issue crossed while checking OFBIZ-6504 - how to Create PDF with password Protected in Ofbiz
When a description used in a drop-down comes from a localised label in CommonEntityLabels.xml and contains a single quote (') this single quote must be escaped to allow the rendering. Else it's a single quote inside 2 single quotes for the option like:
{'key':'EXST_CANCELLED','description':'Annuler l'exemple (En projet)'}
with he percent encoding there is no issue:
{'key':'EXST_CANCELLED','description':'Annuler l%27exemple (En projet)'}

We noted, with Jinghai, that using html entities does not work. I guess due to another encoding further in the chain. I also tried to percent encoding but was unable to find how to replace a % in Freemarker. Thanks to Gareth's suggestion I finally escaped the quote. Also to escape the quote with replaceAll() in Java you have to put 5 \,  small but weird issues ;) I hope nothing else somewhere already escape the quote, we will see anyway...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1693242 13f79535-47bb-0310-9956-ffa450edef68
2015-07-29 11:50:41 +00:00
Jacques Le Roux 6f514d81fb The description attribute of the display-entity element is now escaped to prevent the risk of an XSS attack.
[CVE-2015-3268] Stored Cross-Site Scripting Vulnerability affecting the description attribute of the display-entity element because it was not escaped.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1692357 13f79535-47bb-0310-9956-ffa450edef68
2015-07-23 08:36:36 +00:00
Shi Jinghai a575165ce4 OFBIZ-6504 - Create password protected PDF in OFBiz
1. Changed to use FOP 2.0 native encryption, jars are updated.

2. Now the Embeded options are request parameters supported in ScreenFopViewHandler.java, the options are:
http://xmlgraphics.apache.org/fop/2.0/pdfencryption.html#embedded
the default values of the options can be configured in framework/webapp/config/fop.properties.

3. The demo page is https://localhost:8443/example/control/ExampleReportPdfOptions?exampleId=EX01

4. Barcode is tested.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1691852 13f79535-47bb-0310-9956-ffa450edef68
2015-07-19 20:41:32 +00:00
Jacques Le Roux bc3d048a3f OFBIZ-6544 - The focus-field-name form widget feature is broken
This fixes it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1688772 13f79535-47bb-0310-9956-ffa450edef68
2015-07-02 07:38:02 +00:00
Adrian Crum 4fc6618abe Removed DCL code from TreeFactory.java, small code cleanup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1687348 13f79535-47bb-0310-9956-ffa450edef68
2015-06-24 19:18:16 +00:00
Adrian Crum 73e5b3af04 JavaDoc fixes, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1687141 13f79535-47bb-0310-9956-ffa450edef68
2015-06-23 22:02:33 +00:00
Adrian Crum 6bd65c4b2f Fixed some C&P errors in ModelFieldVisitor.java. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1687093 13f79535-47bb-0310-9956-ffa450edef68
2015-06-23 16:46:06 +00:00
Nicolas Malin 7382855c7b Use as default on <entity-option> and <list-option> description attribute like <display-entity> element. Related issues OFBIZ-6489 and OFBIZ-6490. Thanks to Christian Carlow for this and Gil Portenseigne for the review
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686673 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 21:28:12 +00:00
Adrian Crum e2f875de2d Restored the 'request-confirmation' and 'confirmation-message' menu item attributes that were removed in the recent widget refactoring - https://issues.apache.org/jira/browse/OFBIZ-6334.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686666 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 19:41:05 +00:00