Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux 3c172fda31 This completes r1517629 for one missing "country". Though not independent, and so (I guess) not in http://www.iso.org/iso/home/standards/country_codes/country_names_and_code_elements.htm the Isle of Man exists as an entity https://www.iso.org/obp/ui/#iso:code:3166:IM. It can be crossed coming from other systems, so here it is added (not as part of Great Britain (GBR), like for instance Guernsey and Jersey)
I wonder about the codes of the other parts of GBR. They don't exist in 3166. But they were already in GeoData.xml before the Apache era. Anyway they can't hurt and are not a problem, so far...

This also adds 3166 links to CountryCodeData.xml

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517947 13f79535-47bb-0310-9956-ffa450edef68
2013-08-27 19:32:20 +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
Adrian Crum 1395b2a431 Fixed a bug in MacroMenuRenderer.java - reported by Hans on the dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517880 13f79535-47bb-0310-9956-ffa450edef68
2013-08-27 16:56:14 +00:00
Jacques Le Roux dd8ba13afd This completes r1517629 for missing Geos. Also updates the links to ISO 3166
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517702 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 21:28:09 +00:00
Jacques Le Roux 5749286109 This updates the CountryCode entity data only. I did not find, nor needed, the CountryCapital and CountryTeleCode data. Updating those can be done later...
Note: I used https://www.iso.org/obp/ui/#search and http://www.iso.org/iso/home/standards/country_codes/country_names_and_code_elements.htm. I also subscribed to 3166 Newsletters for continued update...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517629 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 18:21:32 +00:00
Adrian Crum 1f9a6fe029 Restored rev 1517353 and fixed a trivial markup error.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517611 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 17:09:41 +00:00
Jacopo Cappellato 2294582c2d Fixed typo in comment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517451 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 07:59:44 +00:00
Hans Bakker 4ade9fd696 revert r1517353: it makes the tomahawk theme unusable
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517434 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 06:28:00 +00:00
Adrian Crum 93e9949545 Converted menu widget HTML renderer to a macro renderer.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1517353 13f79535-47bb-0310-9956-ffa450edef68
2013-08-25 18:00:43 +00:00
Adrian Crum f5d21055f0 Removed unused and nonsensical method from MenuStringRenderer.java. The MenuStringRenderer instance lifecycle is a single request, so it is unlikely the user login will change in the middle of a request.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1516530 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 18:19:56 +00:00
Jacopo Cappellato 3fd7d250d9 Fixed bug introduced in rev 1490678 (removal of cached DOM tree code and refactoring for thread-safety): after that commit it was not possible to define entity data readers at runtime, this fix re-enables the feature.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1516094 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 06:20:42 +00:00
Adrian Crum 2eb8a4ddfb Added a FIXME note for a bug introduced in revision 1089946.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1513195 13f79535-47bb-0310-9956-ffa450edef68
2013-08-12 16:55:57 +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
Scott Gray 1326aa5e06 Fix typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1512565 13f79535-47bb-0310-9956-ffa450edef68
2013-08-10 05:16:25 +00:00
Jacques Le Roux c943b51124 A patch from Pierre Smits for "UnitData.xml is missing some liquid volume measures" https://issues.apache.org/jira/browse/OFBIZ-5277
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1512307 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 13:58:31 +00:00
Hans Bakker afb70f3469 corrections of errors introduced with r1511742
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1512129 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 02:35:39 +00:00
Jacques Le Roux 1956e731a3 No functional changes, only formatting.
While looking for other cases like r1459222 and r1509164 introduced by r1300812 and r1305309. I noticed there were a lot of wrong for loops formatting (miss a white space after for), this changes it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1511742 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 12:28:01 +00:00
Jacques Le Roux 89c5b3e373 A patch from Leon for "slight patch to "other-field-size" of drop-down form element"" https://issues.apache.org/jira/browse/OFBIZ-5285
"other-field-size" of drop-down form element is a very nice feature, but it's crippled in current version.
attached a patch to make it works and added an example section for that into FormWidgetExample.

jleroux: Interesting, I did not know this feature existed, it was committed long ago by David (before ASF era) 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1511279 13f79535-47bb-0310-9956-ffa450edef68
2013-08-07 12:24:10 +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
Scott Gray 955b6745f5 Fix bug preventing deadlock retries for groovy services, GenericEngine implementations and services should never modify the service context
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1509510 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 01:19:53 +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
Hans Bakker 7d904526a0 missing file related to r1506836
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1508362 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 09:45:18 +00:00
Hans Bakker d3248ec21b be able to set a font for pdf generation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1506836 13f79535-47bb-0310-9956-ffa450edef68
2013-07-25 07:53:29 +00:00
Jacques Le Roux 26e2c7744a A slightly modified patch from Niclas Malin for "New elements auto-parameters-[entity/service] for link/hyperlink" https://issues.apache.org/jira/browse/OFBIZ-4472
When you want edit/remove an entity from link call it's needed to give all pk on parameter element as like :
{quote}         <field name="deleteLink">
            <hyperlink target="example_deleteExampleFeatureAppl">
                <parameter param-name="exampleId"/>
                <parameter param-name="exampleFeatureId"/>
                <parameter param-name="fromDate"/>
            <hyperlink/>
         </field>
{quote}

To simplify, I introduce auto-parameters-entity like this :
{quote}
         <field name="deleteLink">
            <hyperlink target="example_deleteExampleFeatureAppl">
                <auto-parameters-entity entity-name="ExampleFeatureAppl"/>
            <hyperlink/>
         </field>
{quote}
or 
{quote}
         <form name="ListExampleFeatureAppls" type="list" default-entity-name="ExampleFeatureAppl">
         <field name="deleteLink">
            <hyperlink target="example_deleteExampleFeatureAppl">
                <auto-parameters-entity/>
            <hyperlink/>
         </field>
{quote}
This method is inspired from auto-fields-entity and I homogenized on widget renderer screen (link), menu (link) and form (hyperlink, sub-link)

jleroux: I simply put returns in case of no dispatcher or delegator



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1506835 13f79535-47bb-0310-9956-ffa450edef68
2013-07-25 07:52:45 +00:00
Jacques Le Roux f3a1c6455a Rhaaa another wrong C/P, better use patches really :/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1506828 13f79535-47bb-0310-9956-ffa450edef68
2013-07-25 07:18:03 +00:00
Jacques Le Roux e12b1f16d5 Rhaaa another typo, better use patches really :/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1506504 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 11:31:45 +00:00
Jacques Le Roux 083ff1d61f Completes "Wrong to use !jQuery('#content-messages') in \framework\images\webapp\images\selectall.js line #354" https://issues.apache.org/jira/browse/OFBIZ-5279
Using submitted patch as a basis.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1506499 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 11:20:45 +00:00
Jacques Le Roux dff935ac8a Fixes a typo spotted out by Wei Zhang
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1506418 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 06:58:48 +00:00
Jacques Le Roux a707436821 Fixes "Wrong to use !jQuery('#content-messages') in \framework\images\webapp\images\selectall.js line #354" https://issues.apache.org/jira/browse/OFBIZ-5279
Replaces 
if(!jQuery('#content-messages'))
by
if(jQuery('#content-messages').length==0)
in framework\images\webapp\images\selectall.js line #354.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1506274 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 20:50:04 +00:00
Adrian Crum 9d76e3b412 Improved the parsing logic in FlexibleStringExpander.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1506151 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 16:41:02 +00:00
Vikas Mayur 2d6b821a45 Removed redundant comment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1504500 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 15:39:38 +00:00
Jacques Le Roux 739e937988 A patch from Pierre Smits for "Currency names of CZK and HRK are wrong" https://issues.apache.org/jira/browse/OFBIZ-5264
In CurrencyData.xml the names of the currencies of the Czech Republic and of Croatia are wrong.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502946 13f79535-47bb-0310-9956-ffa450edef68
2013-07-14 07:39:16 +00:00
Jacques Le Roux 66a77f5864 A patch from Pierre Smits for "Enhance GeoData.xml with Croatia as a member of the European Union" https://issues.apache.org/jira/browse/OFBIZ-5263
Per July 1st, 2013 Croatia joined the European Union.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502944 13f79535-47bb-0310-9956-ffa450edef68
2013-07-14 06:50:19 +00:00
Jacques Le Roux 107a6762b6 No functional change.
When I reverted r1311214 for "set different ports for testing in a CI environment (e.g. Jenkins)" https://issues.apache.org/jira/browse/OFBIZ-4794 I did not notice Jacopo's also changed some ports value at r1324614
This reverts r1324614 to have things consistent. I don't backport (only R12.04 is concerned) because as long as catalina/ofbiz-component.xml is consistent (port =+ 1) things are working

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502121 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 05:38:47 +00:00
Hans Bakker ad8ae088de add a csv import/export invoices at an organizational level with partyid and productid translation functions, more imports/exports will follow
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1502093 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 03:14:30 +00:00
Adrian Crum c563479956 Removed support for runtime nested expressions in FlexibleStringExpander.java. This fixes the vulnerability CVE-2013-2250
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1500772 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 14:37: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
Jacopo Cappellato 15b6e19cc5 Upgrade from Tomcat 7.0.41 to 7.0.42
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1500760 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 14:26:34 +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
Jacques Le Roux b95ad64f58 A patch from Deepak Dixit for "Application Menu items should be link not hidden form." https://issues.apache.org/jira/browse/OFBIZ-4913
Application menu item should be link not hidden form. As if its hidden form then you can not open it in new tab. 
Default menu item link type auto, and its create an hidden for for link if controller request call an event, but in menu item this should be link.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1500382 13f79535-47bb-0310-9956-ffa450edef68
2013-07-07 07:43:31 +00:00
Jacopo Cappellato dbc1d23f5d Upgrade from Tomcat 7.0.40 to Tomcat 7.0.41
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1499732 13f79535-47bb-0310-9956-ffa450edef68
2013-07-04 12:30:52 +00:00
Jacopo Cappellato 498ab7e68c Fix for typo in a comment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1499706 13f79535-47bb-0310-9956-ffa450edef68
2013-07-04 09:34:20 +00:00
Jacques Le Roux 015c93c8a7 Better (actually working) version of getServiceResult() function when handling parameters (OK also w/o)
OOTB, it's a non functional change, since the getServiceResult() function was not yet used with parameters

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1499477 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 17:09:48 +00:00
Adam Heath d950b6fb05 FEATURE: Allow constant numbers to be directly added to a query, instead
of having to deal with some kind of map/generic value.  This makes it
simpler to use full-text-search queries thru the entity
engine(postgresql and oracle).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497893 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 19:08:39 +00:00
Adam Heath 35f83deb96 FEATURE: Add extension points to the controller login workflow; this
allows other components to automatically insert themselves, without
having to modify any existing files.  This can be used for integrating
with Jasig CAS, or with OpenID.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497892 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 19:08:32 +00:00
Adam Heath 256a4af82b FEATURE: Allow for externalLoginKey parameter generation to be turned
off; the use for this feature will become apparent shortly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497891 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 19:08:24 +00:00
Adam Heath e746f4da83 FIX: java.sql.Timestamp extends java.util.Date, and both have converters
registered.  In some cases, however, the Date convertor would be used
instead of the more correct Timestamp convertor.  This fix implements a
most-specific type algorithm to find the better convertor.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497890 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 19:08:16 +00:00
Adam Heath 8a497262d9 FIX: If using <extend-entity> to change the type of a pre-existing
field, then we need to be certain to remove the existing defined field
from the list of available fields.  Otherwise, you'll end up with the
same field being queried in SELECT, and the same field being updated in
INSERT or UPDATE.

This issue was discovered when changing the type of a pre-existing
field(so that the length of the field could be increased).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497889 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 19:08:09 +00:00