Commit Graph
7306 Commits
Author SHA1 Message Date
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
Jacques Le Roux 61e4de019a A patch from Arpit Singh Pandya for "Cancel/Done is not working correctly on Create User Login page." https://issues.apache.org/jira/browse/OFBIZ-5252
When we navigate on create user login page from party profile on clicking "Create New" link in User Name(s) Section, "Cancel/Done" is not working correctly on Create User Login page. partyId is missing with link. It is not working on trunk and 12.04, not sure about other versions. 

jleroux: 11.04 is concerned, 10.04 is OK

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497839 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 16:46:18 +00:00
Jacques Le Roux 538938e115 A patch from Petr Pytelka for "Czech localization (CommonUiLabels.xml)" https://issues.apache.org/jira/browse/OFBIZ-5249
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497731 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 10:57:33 +00:00
Jacques Le Roux 2d2e190856 A slightly enhanced path from Leon for "in zh locale, state does not change to "No States/Provinces exist" if select a country without any state defined" https://issues.apache.org/jira/browse/OFBIZ-5246
With "zh" (chinese) locale, coutry-state associated list, if you choose a country there's no any associated state defined in system, the state filed does not change.
cause: incorrect translate of "CommonNoStatesProvinces" for "zh" locale. In that, it use full-width colon ":" instead of half one plus blank space(": ").
why half-width and blank space (": ")? see code in "getDependentDropdownValues" function:

jleroux; I added a comment to prevent such cases in future

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497376 13f79535-47bb-0310-9956-ffa450edef68
2013-06-27 14:32:10 +00:00
Jacques Le Roux 1922c31b56 A patch from Petr Pytelka for "Czech localization (conditional.xml)" https://issues.apache.org/jira/browse/OFBIZ-5247
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1497341 13f79535-47bb-0310-9956-ffa450edef68
2013-06-27 13:13:18 +00:00
Jacques Le Roux 5dba698b83 No functional changes while working on OFBIZ-4794
* Organize imports
* Fix wrong comments

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1495807 13f79535-47bb-0310-9956-ffa450edef68
2013-06-23 11:02:41 +00:00
Adrian Crum b23cbb323e Fix for NPE introduced in rev 1494057, reported by Ankit Jain on the dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1494668 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 15:52:27 +00:00
Adrian Crum 129144e2bc Form widget sort field improvement - add the ability to specify help text on column headers.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1494057 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 07:58:25 +00:00
Jacopo Cappellato a4db370bbc Removed appender-ref reference that I forgot to remove as part of 1489461; thanks to Deepak Dixit for reporting this.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493658 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 06:57:40 +00:00
Jacques Le Roux 1c557fb0f7 Useless and possibly confusing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493479 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 09:23:04 +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 5fe2414094 Much smarter UtilXml.java nodeNameToJavaName method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493473 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 07:34:46 +00:00
Jacques Le Roux a07f94c3a6 A patch from Olivier Heintz for "Portal page personalization is not working" https://issues.apache.org/jira/browse/OFBIZ-5189
Two simples errors after last change from FastList to standard java List :
1) go to example component / Dasboard 
1.1) click on edit for one page
Screen is blocked
reason : 
{code}
                    for (GenericValue portalPage : portalPages) {
                        cond = EntityCondition.makeCondition(UtilMisc.toList(
                                EntityCondition.makeCondition("ownerUserLoginId", EntityOperator.EQUALS, userLoginId),
                                EntityCondition.makeCondition("originalPortalPageId", EntityOperator.EQUALS, portalPage.getString("portalPageId"))),
                                EntityOperator.AND);
                        List <GenericValue> privatePortalPages = delegator.findList("PortalPage", cond, null, null, null, false);
                        if (UtilValidate.isNotEmpty(privatePortalPages)) {
                            portalPages.remove(portalPage);
                            portalPages.add(privatePortalPages.get(0));
                        }
                    }
{code}
code iterate on a list and modify it, I don't know how it could work before ;-)
I propose to use an other list on iterate 

2) on appbarclose.ftl for tomawak theme there is
{code}
    <#assign portalPage = delegator.findOne("PortalPage", findMap, true)>
{code}
when you click to "revert to original" in dasboard screen
{code}
Error on line 45, column 5 in component://tomahawk/includes/appbarClose.ftl delegator.findOne("PortalPage", findMap, true) is undefined. It cannot be assigned to portalPage The problematic instruction: ---------- ==> assignment: portalPage=delegator.findOne("PortalPage", findMap, true) [on line 45, column 5 in component://tomahawk/includes/appbarClose.ftl] -
{code}
2.1) to see the error, modify ExampleMenus.xml and change menu-item name from "Dasboard" to "Dasboard1" 
2.2) go to example / dashboard and edit one page
2.3) click to "revert to original"
I propose to add ?if_exists 

One other bug in portal page personalization.
When trying to delete portlet or column in portal page, there is an error because in delete service, cache is used to read data before remove.

Correction proposed is to remove use-cache="true"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493352 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 13:40:42 +00:00
Jacques Le Roux 3f08d5682d value attributes were not correctly closed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493332 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 09:19:29 +00:00
Adrian Crum f98fb17f6b Russian translations for SecurityUiLabels.xml and SecurityextUiLabels.xml.
https://issues.apache.org/jira/browse/OFBIZ-5226


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493327 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 08:14:07 +00:00
Adrian Crum 95cfc8f385 Russian translation for CommonEntityLabels.xml.
https://issues.apache.org/jira/browse/OFBIZ-5221


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493326 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 08:02:02 +00:00
Adrian Crum e6f6163b85 Fixed a bug in MacroFormRenderer.java where UEL expressions were not evaluated in Ajax elements.
https://issues.apache.org/jira/browse/OFBIZ-5227


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1493325 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 07:56:22 +00:00