Commit Graph
1568 Commits
Author SHA1 Message Date
Adrian Crum 3d3ea2ad67 Small fixup for my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1654672 13f79535-47bb-0310-9956-ffa450edef68
2015-01-25 17:56:26 +00:00
Adrian Crum 771e10f1c4 First pass at extracting grid widget from the form widget. This commit has a lot of duplicate code - future commits will reduce and reuse the duplicate code.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1654670 13f79535-47bb-0310-9956-ffa450edef68
2015-01-25 17:18:24 +00:00
Adrian Crum 1a23f8c1d7 Some fixups for the recent widget refactor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653614 13f79535-47bb-0310-9956-ffa450edef68
2015-01-21 17:35:49 +00:00
Adrian Crum 350053b05f Fixed a portal menu item bug caused by the recent widget refactoring - https://issues.apache.org/jira/browse/OFBIZ-6022.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653597 13f79535-47bb-0310-9956-ffa450edef68
2015-01-21 16:54:18 +00:00
Adrian Crum c71dc63d27 Fixed a lookup bug caused by the recent widget refactoring, reported by lmac on the user mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653296 13f79535-47bb-0310-9956-ffa450edef68
2015-01-20 16:51:56 +00:00
Adrian Crum dcecdd25a4 Reorganized the screen widget src folder so classes are more organized.
This commit might break some Groovy scripts. There seemed to be a lot of C&P widget import statements, but there were no widget classes being used in the script, so I removed them. I might have overlooked something though.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652852 13f79535-47bb-0310-9956-ffa450edef68
2015-01-18 21:03:40 +00:00
Adrian Crum 24a54944fd Some fixups for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652688 13f79535-47bb-0310-9956-ffa450edef68
2015-01-17 22:38:38 +00:00
Adrian Crum f8daffe432 Build out XmlWidgetFieldVisitor. I am finished working on this feature, but it is not complete. There are some TODO: comments, and if anyone wants to work on them, they are welcome to do so.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652672 13f79535-47bb-0310-9956-ffa450edef68
2015-01-17 20:43:48 +00:00
Adrian Crum 28fecf1efc Revert unintentional change in my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652641 13f79535-47bb-0310-9956-ffa450edef68
2015-01-17 16:59:30 +00:00
Adrian Crum ed262228b2 Screen widget overhaul:
1. Extract and reuse common code/artifacts.
2. Organized the class structure so it makes more sense.
3. Add an XML widget visitor - this restores and improves the widget classes toString() methods. This is a WIP.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652638 13f79535-47bb-0310-9956-ffa450edef68
2015-01-17 16:47:23 +00:00
Nicolas Malin 0b0d83657c restore element parameter, auto-parameters-entity and auto-parameters-service removed by error at revision r1650821
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1652312 13f79535-47bb-0310-9956-ffa450edef68
2015-01-15 23:45:59 +00:00
Adrian Crum 65640c3a50 FIXME comment in screen widget schema, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650821 13f79535-47bb-0310-9956-ffa450edef68
2015-01-10 22:18:31 +00:00
Adrian Crum 2e8e62cba7 Form widget improvement: Set focus on first control when rendering a single form.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650357 13f79535-47bb-0310-9956-ffa450edef68
2015-01-08 19:25:41 +00:00
Adrian Crum ca9c76ad84 Improved code for ModelForm.java - better handling of attributes when extending a form widget.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650348 13f79535-47bb-0310-9956-ffa450edef68
2015-01-08 17:55:09 +00:00
Jacopo Cappellato 409dc4303c OFBIZ-5944: before trying to pull the values for the form's fields, check if the key exists in order to avoid an IllegalArgumentException if the map is a GenericEntity. Thanks to Christian Carlow for the report and to Deepak Dixit and Divesh Dutta for the research and useful comments.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649742 13f79535-47bb-0310-9956-ffa450edef68
2015-01-06 07:43:00 +00:00
Adrian Crum 91feff5f51 Updated the UI label files so they reference a schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649666 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:24:18 +00:00
Adrian Crum d2375c12d0 Fix a C&P error in ModelMenuItem.java - https://issues.apache.org/jira/browse/OFBIZ-5943
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649384 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 19:02:29 +00:00
Adrian Crum 0b3a5ef360 JavaDocs for widget actions, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649331 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 13:41:03 +00:00
Adrian Crum 6db50a5b0a Update tree widget schemas & models to reuse shared actions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649329 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 13:39:35 +00:00
Adrian Crum 31135b6076 Update widget schemas to reuse shared actions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649291 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 04:51:08 +00:00
Adrian Crum 1f4c7e268f ModelMenuAction.java thread safety.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649286 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 03:17:28 +00:00
Adrian Crum d2ca9a7a0c Remove unused widget class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649285 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 03:16:39 +00:00
Adrian Crum f2190af53e Refactor ModelFormAction.java to reuse common widget action models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649283 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 03:07:40 +00:00
Adrian Crum d3c7dbb53e Code cleanup and thread safety in ModelWidgetAction.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649281 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 02:41:56 +00:00
Adrian Crum 73cc6c2cbf ModelWidgetAction.java code formatting, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649280 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 01:40:36 +00:00
Adrian Crum 88a71146d1 Tree widget documentation, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649275 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 00:12:24 +00:00
Adrian Crum 9cbe119625 Final pass at making tree widget thread-safe.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649272 13f79535-47bb-0310-9956-ffa450edef68
2015-01-04 00:02:04 +00:00
Adrian Crum 2f920b837c Renamed ModelWidgetAction factory method to newInstance - which better describes what it does.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649248 13f79535-47bb-0310-9956-ffa450edef68
2015-01-03 21:00:04 +00:00
Adrian Crum 9db32ed762 Fixed a bug in tree rendering - https://issues.apache.org/jira/browse/OFBIZ-5313
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649239 13f79535-47bb-0310-9956-ffa450edef68
2015-01-03 19:52:21 +00:00
Adrian Crum 34fcdd98b7 Small code cleanup in MacroTreeRenderer.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649238 13f79535-47bb-0310-9956-ffa450edef68
2015-01-03 19:50:42 +00:00
Adrian Crum 9344bbcc2f Second pass at making tree widget thread-safe. This is a WIP.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649230 13f79535-47bb-0310-9956-ffa450edef68
2015-01-03 18:40:39 +00:00
Adrian Crum 98b1b64741 First pass at making tree widget thread-safe. This is a WIP.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649096 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 19:26:30 +00:00
Adrian Crum e46c5a3bc5 Tree widget - remove stored references to Delegator and LocalDispatcher.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649090 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 18:55:48 +00:00
Adrian Crum c8604d941a Code formatting in ModelTree.java, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649086 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 18:11:11 +00:00
Adrian Crum ee0093ae71 Refactor tree widget to reuse common condition models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649084 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 17:52:29 +00:00
Adrian Crum 18cf8f749a Reverting rev 1646969 because it breaks tree rendering.
I need this fixed so I can begin working on tree widget refactoring. During refactoring I will most likely solve the problem rev 1646969 was trying to fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649083 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 17:49:49 +00:00
Adrian Crum 55761dfeb3 Rewrite ModelMenuItem.java to make it thread-safe.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649072 13f79535-47bb-0310-9956-ffa450edef68
2015-01-02 16:12:09 +00:00
Jacopo Cappellato a5879b6f8f Moved code dependent on OWASP ESAPI and utilities for codec tasks from StringUtil to a new UtilCodec class: now the UtilCodec class is the only class dependent on OWASP ESAPI.
The DefaultEncoder from OWASP ESAPI, used internally by UtilCodec is now built with the default constructor that also adds the JavascriptCodec to the list of codecs used to canonicalize and validate the input.
Renamed the UrlEncoder class to UrlCodec in order to better describe its behavior.
Misc minor cleanups.
Added to the list of tests of the base component a series of Junit test classes that were missing.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648403 13f79535-47bb-0310-9956-ffa450edef68
2014-12-29 18:24:57 +00:00
Jacopo Cappellato b969e376ed A series of cleanup to the integration with OWASP ESAPI. Isolated dependencies on the external OWASP ESAPI jar into the StringUtil class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648298 13f79535-47bb-0310-9956-ffa450edef68
2014-12-29 09:24:46 +00:00
Adrian Crum dfb9f37a1f Refactor menu widget to reuse common condition models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648153 13f79535-47bb-0310-9956-ffa450edef68
2014-12-28 08:13:28 +00:00
Adrian Crum 51f7152723 Extract screen widget condition models to a separate class so they can be reused in other widgets.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648152 13f79535-47bb-0310-9956-ffa450edef68
2014-12-28 07:37:03 +00:00
Adrian Crum 1fc589d681 Some fixups for the Form widget refactor.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648142 13f79535-47bb-0310-9956-ffa450edef68
2014-12-28 02:22:06 +00:00
Adrian Crum cd3ed9f83d Begin work on ModelMenu.java thread safety.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648093 13f79535-47bb-0310-9956-ffa450edef68
2014-12-27 19:18:12 +00:00
Adrian Crum e5fcf293ae Merged revision(s) 1635411 from ofbiz/branches/boostrap_theme:
MacroScreenViewHandler.java improvement: get macro library locations from Visual Theme resources. Themes can create their own HTML now.

resourceTypeEnumId=VT_SCRN_MACRO_LIB - screen macro library location
resourceTypeEnumId=VT_FORM_MACRO_LIB - form macro library location
resourceTypeEnumId=VT_TREE_MACRO_LIB - tree macro library location
resourceTypeEnumId=VT_MENU_MACRO_LIB - menu macro library location


Merged revision(s) 1635465 from ofbiz/branches/boostrap_theme:
Fix ClassCastException.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1648013 13f79535-47bb-0310-9956-ffa450edef68
2014-12-26 19:06:30 +00:00
Adrian Crum 124b003d0d Rewrite ModelFormField.java and related classes. Most of this is thread-safe now. Implemented a builder design because the original ModelForm design makes several passes over the fields - modifying them incrementally. Now ModelForm modifies builders instead, then when the parsing process is complete, the builders create the thread-safe field models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647936 13f79535-47bb-0310-9956-ffa450edef68
2014-12-26 06:47:13 +00:00
Ashish Vijaywargiya c572355faf Applied patch from jira issue OFBIZ-5313 - Tree rendering is missing labels.
Thanks Sumit for creating the issue and providing the patch for the same. Thanks Arun for verifying the issue. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646969 13f79535-47bb-0310-9956-ffa450edef68
2014-12-20 12:37:07 +00:00
Jacques Le Roux 73e1958d50 No functional changes
Removes a tab found by chance. 
My Eclipse setting automatically adds Override annotations when needed

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646656 13f79535-47bb-0310-9956-ffa450edef68
2014-12-19 09:35:55 +00:00
Ashish Vijaywargiya 039f0608bc Applied framework related patch from jira issue - OFBIZ-5844 - Convert java files to EntityQuery.
Thanks Arun for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1646212 13f79535-47bb-0310-9956-ffa450edef68
2014-12-17 12:13:46 +00:00
Jacques Le Roux cd75b72260 A patch from Leon for ""Value" attribute of hidden form field is overridden by same name value in context" https://issues.apache.org/jira/browse/OFBIZ-5904
Uses URLEncoder.encode while rendering a link
Uses StringUtil.htmlEncoder.encode while rendering a form field. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1644904 13f79535-47bb-0310-9956-ffa450edef68
2014-12-12 14:46:56 +00:00
Ashish Vijaywargiya 9e044d163a Applied patch from jira issue - OFBIZ-5902 - Fetch configurable settings data driven by replacing UtilProperties.getPropertyValue() method with EntityUtilProperties.getPropertyValue(). Thanks so much Arun for this important contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1644015 13f79535-47bb-0310-9956-ffa450edef68
2014-12-09 10:09:22 +00:00