Commit Graph
1089 Commits
Author SHA1 Message Date
Jacques Le Roux 8802023ece Fix a small bug where delegator was missing in a Groovy script
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1606660 13f79535-47bb-0310-9956-ffa450edef68
2014-06-30 09:59:06 +00:00
Adam Heath 5bc5c4151f Change encrypt=true fields to no longer have a pre-pended salt value.
This is done by just setting the length of salt bytes to 0, but still
having a length byte prepended.

Add a feature to allow for certain fields to actually have a salt
prefix.  This is enabled by setting encrypt=salt in the entity
definition.

This change is slightly incompatible with existing code.  Old database
values will continue to be decrypted correctly.  However, newly
encrypted values will no longer have a salt prepended, while originally
they would.  This shouldn't be a problem in practice.

This change, along with the previous commit, finally allow for direct
lookup of encrypted values.  However, already stored values will not be
found.  To fix those, each database row will have to be read in by
ofbiz, then immediately written back out.

This is part two to completely fix OFBIZ-5959:
Person.socialSecurityNumber can't be used for findByAnd.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1604968 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 00:23:23 +00:00
Jacques Le Roux da63b56fbb Improves serviceResult.ftl, from Yvan Cauchy (reformatted: we use 2 spaces for indentation in FTL files)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1597237 13f79535-47bb-0310-9956-ffa450edef68
2014-05-24 05:07:39 +00:00
Jacopo Cappellato 1ea8fe79b2 Fixes for a bug reported by Pierre Smits in OFBIZ-4130 (and OFBIZ-5319): a tenant user can access, via the delegator, the meta data information of other tenants; for example a tenant user with grants to use the Webtools application could view/edit the database details of all tenants.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1589589 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 05:19:13 +00:00
Jacques Le Roux 328ae4e946 A patch from Justen Walker for "Missing import in FindGeneric.groovy" https://issues.apache.org/jira/browse/OFBIZ-5504
Revision 1560176 introduces a change to FindGeneric.groovy that extracts some logic into UtilMisc. However, this class is not imported in the file and results in a MissingProperty exception.
This patch adds the import statement which resolves this bug.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1560699 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 14:35:20 +00:00
Jacques Le Roux 0757ed8a24 A patch from Gareth Carter for "last index for paging is not calculated correctly" https://issues.apache.org/jira/browse/OFBIZ-5497
The last index (used on the last button) is not calculated correctly in ftl or the renderer classes. It currently users floor which works only for list sizes that are not multiples of the view size. When you have a list size which is a multiple of the view size, it does not subtract 1 for zero based index and therefore the last button goes to the last page + 1

Examples

listSize = 1
viewSize = 10
listSize / viewSize = 0.1
floor(0.1) = 0
This one produces the correct value

listSize = 20
viewSize = 10
listSize / viewSize = 2
floor(2) = 2
Last index should be 1 because of zero based index but never occurs

To reproduce, enter a view with a list and paging functionality, the list size must be a multiple of the view size


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1560176 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 20:53:29 +00:00
Jacques Le Roux eb01bb126d Misc. cleaning in labels
Removes all empty ones
Removes some redundant/duplicates ones (please committers don't commit those again, I know it's not easy to catch, hopefully now we should have less of them)
Automatically replaces some tabs
Few French labels improvements
Removes 2 orphan entries ("ja" & "cs")
Fixes the schema header of WebtoolsUiLabels.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551594 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 16:00:50 +00:00
Jacques Le Roux 4c3e9b7ec8 No functional changes:
Removes all remaining unchecked warnings
Automatically adds some @Override

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551207 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 13:30:46 +00:00
Adrian Crum e04471523b Fixed a bug in the setSyncServiceParameters screen. Some service parameter data types would cause FreeMarker to throw an exception.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1542388 13f79535-47bb-0310-9956-ffa450edef68
2013-11-15 20:42:37 +00:00
Adrian Crum bfe1317c16 Fixed broken ModelInduceFromDb.jsp file.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1539781 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 19:44:41 +00:00
Adrian Crum af23fe0b35 Refactored ConfigXMLReader.java - added exception handling. The class swallowed exceptions like controller.xml file is missing or invalid - making debugging difficult. This commit introduces a WebAppConfigurationException and it propagates that exception farther up the stack.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1534517 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 06:50:05 +00:00
Jacques Le Roux c8ce55ecc9 A patch from Anahita Goljahani for Fixed mispelling of "occurred" https://issues.apache.org/jira/browse/OFBIZ-5342
jleroux: this includes a safe change in jquery.validate.js and jquery.validate.min.js

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1530341 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 16:35:40 +00:00
Jacques Le Roux 53ccd2ceb7 Fixes "Overview of routings does not paginate" https://issues.apache.org/jira/browse/OFBIZ-5322 and more
Actually it does paginate but the value is not dependent on widget property widget.form.defaultViewSize which default value is 20. It uses a default value of 50 which is defined by

<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="3"/>

You can easily test it using https://localhost:8443/manufacturing/control/FindRouting?VIEW_SIZE=3

This is legacy from pre Apache era. I found 143 cases where a default-value is defined in screens for VIEW_SIZE.

I did not look into details for the 143 cases but I believe most are also legacy.
There are few default values: 10, 20, 30, 50, 500 and even an extreme case of 10000 for InventoryItemTotalsExport!
There is only one comment for LookupBulkAddProducts which is also legacy: <!-- 10 rows seems more appropriate given screen size, etc. -->

I suggest to OOTB replace all those by the widget.form.defaultViewSize value.
Things will then be consistent and easily changeable on a global scale using the widget property.
Or if really needed forcing the default-value as it's done now.

So this would be applied on the 143 cases (I checked, viewSizeDefaultValue does not exist in any screen)

<property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526387 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 05:55:32 +00:00
Jacopo Cappellato f77307f71e Removed commented out lines created for test purposes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523739 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 18:13:51 +00:00
Jacques Le Roux c70c41921d "Fix online help issues" https://issues.apache.org/jira/browse/OFBIZ-5320
This fixes most of the issues but some are remaining, I report them in OFBIZ-5320

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523423 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 09:41:28 +00:00
Hans Bakker 8d58d0d9e9 remove typing error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1521348 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 02:07:53 +00:00
Hans Bakker 7be06f2f43 small improvements of the programmable database export
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1520954 13f79535-47bb-0310-9956-ffa450edef68
2013-09-09 03:10:00 +00:00
Hans Bakker 2908317017 added a new menu item in webtools: 'programmable export' where interactively a groovy program can be entered to export specifc records from the database. In order to apply some global changes for re-import
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1520505 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 08:03:34 +00:00
Adrian Crum 91b46386b4 Improved the Web Tools -> Layout Demo screen so that menu rendering can be tested.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517883 13f79535-47bb-0310-9956-ffa450edef68
2013-08-27 16:57:30 +00:00
Hans Bakker 545a33e723 also show the components without a webapp
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1512886 13f79535-47bb-0310-9956-ffa450edef68
2013-08-11 07:11:49 +00:00
Hans Bakker 54d19f4348 fixed some errors in the component test list screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1512877 13f79535-47bb-0310-9956-ffa450edef68
2013-08-11 06:25:12 +00:00
Hans Bakker d7069c79e8 work in progress: made the componentlist paged, ordered and more readable, clicking on the component name provides a junit test list from which a test can be run. even in production because all database changes are rolled back
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1509516 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 02:56:59 +00:00
Hans Bakker f85167e1ca make component list the top level menu item of 'artifacts' because loading fast. move the 'take some time' message on the lower level menu iem now renamed to 'atifact search'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1508738 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 06:26:37 +00:00
Jacques Le Roux 76274c5448 Better labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1500771 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 14:37:14 +00:00
Jacques Le Roux cff3539f53 French labels and better en label for WebtoolsMetricsRate
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1500705 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 13:00:28 +00:00
Adrian Crum 21f9c859d7 Removed the XSD-to-Java feature. Tools to make OFBiz development easier are outside the scope of the project.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1500424 13f79535-47bb-0310-9956-ffa450edef68
2013-07-07 13:05:14 +00:00
Adrian Crum b027bcc12e XsdToJava.ftl improvement - Append "Element" to class names to avoid name clash.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493474 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 07:36:08 +00:00
Adrian Crum 18b5135a31 Third pass at removing cached DOM tree code from EntityConfigUtil.java. I converted some of the code to use the new thread-safe models.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490938 13f79535-47bb-0310-9956-ffa450edef68
2013-06-08 09:34:47 +00:00
Adrian Crum e4b12f06c4 Fixed a bug caused by recent ServiceConfigUtil.java changes: https://issues.apache.org/jira/browse/OFBIZ-5212.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490549 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 08:57:05 +00:00
Adrian Crum 92d007e6f1 XSD-to-Java bug fix - fixed bad class field name.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490144 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 05:16:08 +00:00
Adrian Crum a490245e67 XSD-to-Java bug fix - added missing throws clause.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1490126 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 04:25:48 +00:00
Adrian Crum 89ce6062f6 XSD-to-Java improvement - better discovery of child elements.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489723 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 06:34:50 +00:00
Jacopo Cappellato 1dc46b9fd7 Some cleanups for my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489476 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 15:33:30 +00:00
Jacopo Cappellato 4ae936a5f3 The content rendered in the Webtools "view log" screen is now rendered from the ofbiz.log file rather then the ofbiz.html file in order to provide more control on the html code rendered in the screen. This fixes the vulnerability CVE-2013-2137
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489461 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 14:48:40 +00:00
Adrian Crum 2dd19d3386 Small fixup for my last commit - remove comments used for development.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489366 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 10:13:48 +00:00
Adrian Crum e5eb503602 New feature: Convert an XSD file to Java source code. The feature creates immutable Java object models that represent the XML file defined by the schema. It supports an optional Visitor implementation.
The feature can be accessed in Web Tools by clicking on the XSD to Java link.

The Java source code is displayed in a text area - where it can be copied-and-pasted to your IDE. The source code is fairly complete, but you will have to fill in some missing bits.

If anyone wants to adapt the feature to make it a command-line utility, then that would be welcome.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489362 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 09:52:10 +00:00
Adrian Crum 00e0e6555d Fixed a problem in Web Tools that was caused by recent entity model changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1484268 13f79535-47bb-0310-9956-ffa450edef68
2013-05-19 10:58:14 +00:00
Adrian Crum 9bd42ec3a2 Reverted revision 1483822.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1484134 13f79535-47bb-0310-9956-ffa450edef68
2013-05-18 16:12:50 +00:00
Jacques Le Roux 929a06dfd5 Improves the Metrics stats by adding a new column used only by requests. It's quite useful to measure the real (not smoothed) durations of events in notably *chained* requests.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1483822 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 14:21:02 +00:00
Adrian Crum 6a5387a708 Fixed a problem in Web Tools that was caused by recent entity model changes. Reported by Olivier Heintz on the user mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1480702 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 15:56:46 +00:00
Adrian Crum fe963375c8 Fixed a problem in Web Tools that was caused by recent entity model changes. Reported by Atul Vani on the user mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1480248 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 12:26:24 +00:00
Adrian Crum 2a5ccbb63b Moving toward immutable entity model classes. Also some code cleanups, simplified API, and JavaDocs.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1477929 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 08:16:56 +00:00
Jacques Le Roux ca43c6a2c4 Just adds a date-time to clarify the moment all caches were cleared
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1465103 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 19:41:42 +00:00
Hans Bakker 56323a459b make the webtools screens use the decorator location from web.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1455024 13f79535-47bb-0310-9956-ffa450edef68
2013-03-11 07:35:16 +00:00
Jacques Le Roux 830f9f7b91 A patch from Shi Jinghai for "Chinese localizations (zh) for trunk (Part II)" https://issues.apache.org/jira/browse/OFBIZ-5137
Translated missing zh labels for projectmgr, scrum, service, webpos and webtools components. These are the last 5 components.





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1448350 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 18:50:33 +00:00
Adrian Crum a0402a0d38 Small improvement to Web Tools services screen: Add service definition location.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446885 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 12:37:20 +00:00
Jacques Le Roux 4bc9aff69c Complete the server hour on webtools jobs list, with the help of Adrian and Atul
Remarks: 
* Finally date.format-1.2.3-min.js is quite useful
* I renamed the getServerHour service to getServerTimestamp. It now returns a Long, easier to parse to a date in javascript
* I renamed WindowClockJs.ftl to ServerHour24HourFormatJs.ftl

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1427233 13f79535-47bb-0310-9956-ffa450edef68
2012-12-31 19:50:54 +00:00
Jacques Le Roux 98f9905f0b Complete the work on server hour for the webtools job list.
* Now uses real server hour
* Renames getDependentDropdownValues.js into miscAjaxFunctions.js, that it is really
* Introduces a minimized version of date.format: date.format-1.2.3-min.js


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1426904 13f79535-47bb-0310-9956-ffa450edef68
2012-12-30 07:33:26 +00:00
Jacques Le Roux e1841ff96b I wanted to have the server hour on the webtools job list, not a bid deal, hé?
As ever, turns it's always more complicated than thought. 
For instance jQuery, even with $.datepicker.formatDate, is not able to format a date + time correctly :/
So I added a new js script: date.format-1.2.3.js. It's only 4kb, I tried to compress it online, did not work, gave up.

This is pretty basic, enough for the needs and can be easily extended when more is needed

5 mins later:

Yikes, this was pretty stupid. I completly forgot about what I thought 2 weeks ago: it's from the server I need the date-time, so I need a json service.
Then, today, I completly forgot about it, and thought again: OK, it will consume less ressources w/out a service, if  I only use javascript. A senior moment  I guess :/

I will rewrite that later, to have the real server hour...
However, the mechanism I quickly built can still be pretty useful in some cases...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1426848 13f79535-47bb-0310-9956-ffa450edef68
2012-12-29 22:08:19 +00:00
Scott Gray 5df3e3f70b Remove a bunch of unused imports, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1418646 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 12:03:52 +00:00