Commit Graph
10472 Commits
Author SHA1 Message Date
Nicolas Malin 70cffbfb2c Form widget hyperlink.id attribute isn't supported by MacroFormRenderer.java (OFBIZ-6403) thanks christian carlow for this issue
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1683642 13f79535-47bb-0310-9956-ffa450edef68
2015-06-04 20:55:59 +00:00
Taher A. Alkhateeb 07cb144a6c Translate the framework to Arabic
Another part of the translation of OFBiz to Arabic 
project found in JIRA OFBIZ-6432.

The commit translates the following components (in varying degrees):
- Content
- Order
- Party
- WorkEffort
- more framework translations

refs https://issues.apache.org/jira/browse/OFBIZ-6432


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682725 13f79535-47bb-0310-9956-ffa450edef68
2015-05-31 12:13:45 +00:00
Taher A. Alkhateeb 62b0f73212 Translate the framework to Arabic
Another part of the translation of OFBiz to Arabic 
project found in JIRA OFBIZ-6432.

The commit translates the following files :
- framework/base/config/DateTimeLabels.xml
- framework/widget/config/conditional.xml

refs https://issues.apache.org/jira/browse/OFBIZ-6432


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682699 13f79535-47bb-0310-9956-ffa450edef68
2015-05-31 08:49:43 +00:00
Nicolas Malin e3dcdf5098 Apply patch from OFBIZ-6417 renderDateFindField doesn't reselect operation by Christian Carlow
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682462 13f79535-47bb-0310-9956-ffa450edef68
2015-05-29 13:39:53 +00:00
Jacques Le Roux cba79daa92 Replaces by better labels, stumbled upon it while backporting r1682415 for OFBIZ-6229. I missed it when committing r1667969
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682444 13f79535-47bb-0310-9956-ffa450edef68
2015-05-29 12:37:29 +00:00
Taher A. Alkhateeb 423d83a51c Provide a fix for OFBIZ-6229 and allow creation of new Geos
Fix the following problems:

- The search screen results take you to the link geos.
  it should go directly to create / edit instead
- You cannot edit a geo because the parameter is not passed across 
  the tabs link and edit / create. The menus should be redefined
  to pass the parameter around
- The primary key is enforced in the service definition when 
  it should be optional to create new geos
- finally, the geoId should not be a lookup field as
  an entity cannot lookup itself

Refs https://issues.apache.org/jira/browse/OFBIZ-6229


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682415 13f79535-47bb-0310-9956-ffa450edef68
2015-05-29 10:43:41 +00:00
Jacques Le Roux 34fe4d09b6 Better documentation for <<Lookup fields break when used with a form having skip-start="true">> https://issues.apache.org/jira/browse/OFBIZ-6139
I also improved the description of the Jira. Thanks to Pierre Smits's questions who tried the feature.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682414 13f79535-47bb-0310-9956-ffa450edef68
2015-05-29 10:25:00 +00:00
Nicolas Malin 1e015b79ba Apply patch from OFBIZ-6415 renderTextFindField doesn't reselect operation dropdown or ignoreCase checkbox by christian carlow
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682342 13f79535-47bb-0310-9956-ffa450edef68
2015-05-28 21:41:52 +00:00
Jacques Le Roux 6ad4d92057 No functional change, just fixes a trivial formatting issue
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682282 13f79535-47bb-0310-9956-ffa450edef68
2015-05-28 17:06:31 +00:00
Michael Brohl 3ccfd17f1f Manually applied patch from jira issue OFBIZ-6310: createConditionList doesn't handle widget dropdown multi-submitted values when called by performFind. Adds detection if the field value represents a collection and in this case sets EntityOperator.IN instead of EntityOperator.EQUALS.
Thanks Christian Carlow for reporting the issue and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682272 13f79535-47bb-0310-9956-ffa450edef68
2015-05-28 16:28:17 +00:00
Michael Brohl 358a7486c5 Applied patch from jira issue OFBIZ-6414: drop-down widget field with allow-multiple="true" does not display current value.
ModelFormField.getEntry returns the string representation of the value corresponding to the field in either the context map or parameters map but when the value is returned as a list [X, Y, Z], the opening and closing brackets are encoded [X, Y, Z]
This prevents the FormRenderer (atleast MacroFormRenderer) from detecting a list object from the string and converting it back to a list
eg - currentValueList = StringUtil.toList(currentValue).

The solution detects a collection value and handles the proper encoding.

Thanks Gareth Carter for reporting the issue and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682234 13f79535-47bb-0310-9956-ffa450edef68
2015-05-28 12:58:31 +00:00
Michael Brohl 6e499d7655 Code cleanup, no functional changes (https://issues.apache.org/jira/browse/OFBIZ-6420)
Removed unnecessary double checks and corrected exception handling where the catched exception was too broad.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682214 13f79535-47bb-0310-9956-ffa450edef68
2015-05-28 11:33:52 +00:00
Michael Brohl 1613bbee07 Manually applied and modified the changes of the patch from jira issue OFBIZ-6312: Catalog Manager's EditProduct screen HTML should place a limit on the size of text that can be entered in the Product Description box.
Introduces a new maxlength attribute to the textarea element in forms, applies the maxlength (255 chars) value in several FTL files, when the DB is limiting the length.

Thanks Forrest Rae for reporting the issue and providing the patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682132 13f79535-47bb-0310-9956-ffa450edef68
2015-05-27 22:18:29 +00:00
Jacques Le Roux 5c7f0b1fcb This closes "Replace bsh code with Groovy code" https://issues.apache.org/jira/browse/OFBIZ-6332 with all its subtasks and more.
jleroux: I suspected it was only a matter of replacing "${bsh" by "${groovy" in *.xml. But I had not the guts to get into 11(!) sub tasks. 
So, in Eclipse, I simply did a S/R in *.xml and compared parts of my changes with some Pierre's most "complex" patches respectively product, ebaystore, projectmgr and scrum. 
They were totally similar (just revisions number changed) so here is the whole. 

I will later improve these changes by removing HTML entities when possible, this is a bit more delicate because in some cases the XML schema are not complete (or/and for other still obscure to me reasons) and if you simply replace HTML entities by simple code (eg &Amp; by &) you get issues in logs when the XML parser cross them...

Note: only menus, screen and forms are changed here.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1682118 13f79535-47bb-0310-9956-ffa450edef68
2015-05-27 20:39:43 +00:00
Jacques Le Roux 6c637a7b7d Implements "The lookup and text-area have a read-only attribute but not the text input field" at https://issues.apache.org/jira/browse/OFBIZ-6395
Adds a read-only attribute to the text input field. Using the display type is not enough, because it's uneasy to assign values through Javascript as using the lookup description-field-name shows OOTB. And the disabled option is not good when you want to still show the submitted values on return.

Also 
* improves widget-form.xsd documentation about read-only attribute for lookup
* completes the foFormMacroLibrary.ftl where placeholder tabindex  were missing (if this even ever makes sense)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680921 13f79535-47bb-0310-9956-ffa450edef68
2015-05-21 16:29:49 +00:00
Jacques Le Roux 55f5564611 A better patch from Adrian for "Field Lookup do not show description when widget-verbose is set to false" https://issues.apache.org/jira/browse/OFBIZ-6396
When widget verbose is set to false and using field lookup, the description of the selected object is not displayed (not using auto completion but the popup).
To reproduce : Set widget.verbose=false in framework/widget/config/widget.properties  
Clear OFBiz cache then go to : https://localhost:8443/partymgr/control/EditPartyRelationships?partyId=Company
In the partyRelationship creation form, in party Id From field, click on lookup, search, select AUTHOR_MADMAX, and so no description displayed. Using autocompletion it's fine.

jleroux: This reverts the previous patch from Gil. It did not occur to me that all the rest of the result was only commented out HTML code, so a simple trim was enough. Happy to get rid of this ugly kludge



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680881 13f79535-47bb-0310-9956-ffa450edef68
2015-05-21 14:18:16 +00:00
Jacques Le Roux 4e2ddf8f0a A patch from Gil Portenseigne for "Field Lookup do not show description when widget-verbose is set to false" https://issues.apache.org/jira/browse/OFBIZ-6396
When widget verbose is set to false and using field lookup, the description of the selected object is not displayed (not using auto completion but the popup).
To reproduce : Set widget.verbose=false in framework/widget/config/widget.properties  
Clear OFBiz cache then go to : https://localhost:8443/partymgr/control/EditPartyRelationships?partyId=Company
In the partyRelationship creation form, in party Id From field, click on lookup, search, select AUTHOR_MADMAX, and so no description displayed. Using autocompletion it's fine.

This patch use a trick to no care about widgetVerbose comments. Sad to use this kind of trick, but if not, spaces might not be trimed. With that, the display is perfect. No side effect detected. 

jleroux: I still regret Hans past attitude about widgetVerbose which initially forced me to this hack 



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680873 13f79535-47bb-0310-9956-ffa450edef68
2015-05-21 13:45:02 +00:00
Jacques Le Roux 8d3e2f88cb A patch from Youssef Khaye updated by Wei Zhang for "Adding a new attribute ignore-when (verry similar to use-when) that enable rendering or not a field in list or multi form." https://issues.apache.org/jira/browse/OFBIZ-4481
Or on a form of type list or multi, it is not possible to completely ignore a field via use-when attribute. Instead it hides the title and the column header became shifted from the table content.
For example I want to hide the description column from my form when exampleName is choosen as sort-field.

This also modifies
    example/widget/example/ExampleForms.xml#ListExamples
to illustrate this functionality


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680865 13f79535-47bb-0310-9956-ffa450edef68
2015-05-21 13:09:01 +00:00
Jacopo Cappellato 74e6dec22f OFBIZ-6380 Upgraded Log4j from 2.2 to 2.3.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680733 13f79535-47bb-0310-9956-ffa450edef68
2015-05-21 05:40:27 +00:00
Adrian Crum 75aefbb887 Remove DCL pattern from MenuFactory.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680329 13f79535-47bb-0310-9956-ffa450edef68
2015-05-19 16:05:13 +00:00
Adrian Crum 60cf53e27e Added visual theme seed data that was missed in rev 1648013.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680319 13f79535-47bb-0310-9956-ffa450edef68
2015-05-19 15:37:36 +00:00
Deepak Dixit 0cb6d60dc8 Added locale and timeZone as a service in parameter for groovy dsl. Now locale and timeZone not passed as service in parameter then groovy dsl will get it from context and passed as service in parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680274 13f79535-47bb-0310-9956-ffa450edef68
2015-05-19 12:43:54 +00:00
Michael Brohl 2f107d8155 Applied patch from jira issue OFBIZ-5610: Date formats displayed in the title of the input field are not correctly showing the default format for UK but the actual date itself is correct.
I had to slightly modify the patch from "en_GB" to "en-GB" entries. Thanks Gareth Carter for reporting the issue and providing the fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680219 13f79535-47bb-0310-9956-ffa450edef68
2015-05-19 09:49:37 +00:00
Jacques Le Roux 8e8dc43528 Fixes in another way "Make background-color in setSourceColor function in fieldlookup.js theme dependent" https://issues.apache.org/jira/browse/OFBIZ-6371
I preferred the idea of using the jQuery UI effect function as explained in the Jira. It's then no longer color dependent since jQuery has #ffff99 as default color and this might be overridden easily in themes...
https://api.jqueryui.com/highlight-effect/

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680201 13f79535-47bb-0310-9956-ffa450edef68
2015-05-19 08:30:47 +00:00
Adrian Crum 240ba74d82 Replace ClassCastException with type check - https://issues.apache.org/jira/browse/OFBIZ-6291.
Ignoring a thrown ClassCastException is a common pattern in the project (one I have used myself), but it should be avoided in the future because it makes debugging difficult, plus it creates objects unnecessarily.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1680058 13f79535-47bb-0310-9956-ffa450edef68
2015-05-18 17:18:54 +00:00
Jacques Le Roux d4818dfd66 A patch from Pierre Smits "util.js is missing licence header" https://issues.apache.org/jira/browse/OFBIZ-6384
jleroux: This is related to OFBIZ-5409. I noted then "The util.js script is introduced for that, though normally should not be needed... "



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1679982 13f79535-47bb-0310-9956-ffa450edef68
2015-05-18 10:58:10 +00:00
Jacques Le Roux 688da5d2d2 "Updates Log4j 2.2 to 2.3" https://issues.apache.org/jira/browse/OFBIZ-6380
Reverts r1679702

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1679723 13f79535-47bb-0310-9956-ffa450edef68
2015-05-16 10:52:41 +00:00
Deepak Dixit 07a7c64d3d Fixed fieldsToSelect type from list to set as find method accept fieldsToSelect as set.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1679719 13f79535-47bb-0310-9956-ffa450edef68
2015-05-16 10:33:40 +00:00
Deepak Dixit 6ce8d7d74d OFBIZ-6351 - Upload function does not work on Party Manager.
Upgrade commons-compress jar from 1.4.1 to 1.9

Thanks Supachai Chaima-ngua and Pierre Smits for reporting the issue, and thanks Supachai Chaima-ngua for providing the fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1679709 13f79535-47bb-0310-9956-ffa450edef68
2015-05-16 09:01:01 +00:00
Jacques Le Roux 4bf39d2316 "Updates Log4j 2.2 to 2.3" https://issues.apache.org/jira/browse/OFBIZ-6380
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1679702 13f79535-47bb-0310-9956-ffa450edef68
2015-05-16 08:27:54 +00:00
Jacques Le Roux 8b7cda5012 Small change for "Improves dialog boxes generated by ajax-window link parameter" https://issues.apache.org/jira/browse/OFBIZ-6359
Adds closeOnEscape

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1679172 13f79535-47bb-0310-9956-ffa450edef68
2015-05-13 10:09:27 +00:00
Deepak Dixit 169dedf9a2 Used UtilHttp.getLocale() to get the locale instead request.getLocale()
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1678911 13f79535-47bb-0310-9956-ffa450edef68
2015-05-12 11:02:42 +00:00
Jacques Le Roux 943e010b81 No functional changes, just simpler syntax, parenthesis not needed here
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1678298 13f79535-47bb-0310-9956-ffa450edef68
2015-05-08 07:58:47 +00:00
Jacques Le Roux 1711869690 Fixes "When used setDependentDropdownValuesJs.ftl precludes focus-field-name" https://issues.apache.org/jira/browse/OFBIZ-6346 with examples in FormWidgetExampleForms.xml and for NewCustomer screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1678294 13f79535-47bb-0310-9956-ffa450edef68
2015-05-08 07:53:39 +00:00
Jacques Le Roux bdea0c167c Temporary reverts r1678291+1678292 to have only 1 commit easier for backporting
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1678293 13f79535-47bb-0310-9956-ffa450edef68
2015-05-08 07:31:57 +00:00
Jacques Le Roux 4ea39c7cef Fixes "When used setDependentDropdownValuesJs.ftl precludes focus-field-name" https://issues.apache.org/jira/browse/OFBIZ-6346 with examples in FormWidgetExampleForms.xml and for NewCustomer screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1678291 13f79535-47bb-0310-9956-ffa450edef68
2015-05-08 07:24:10 +00:00
Jacopo Cappellato 5c2e9841e8 Removed commons-cli jar that was not used: barcode4j has an optional dependency on it but only if used from the command line (which is not the case in OFBiz); Groovy has a dependency on Commons CLI, antlr, asm but it uses a copy of them bundled in groovy-all jar, so removing the pathelements set for the ant path id "groovy.class.path".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1677597 13f79535-47bb-0310-9956-ffa450edef68
2015-05-04 13:36:09 +00:00
Adrian Crum a84272b1ba Trivial code cleanup in ObjectType.java - no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1677386 13f79535-47bb-0310-9956-ffa450edef68
2015-05-03 11:25:08 +00:00
Jacques Le Roux 1054bfa97c Fixes the way the FOP baseUrl was set. This was due to a change introduced for "Allow FOP to support <fo:external-graphic></fo:external> for -Dportoffset" at https://issues.apache.org/jira/browse/OFBIZ-6120
Thanks to Deepak's report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1677123 13f79535-47bb-0310-9956-ffa450edef68
2015-05-01 12:08:59 +00:00
Adrian Crum ebf03ea721 Some work on ComponentContainer.java:
1. Improved thread safety
2. Optimization
3. Code cleanup
4. Use String constant instead of hard-coded value


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676985 13f79535-47bb-0310-9956-ffa450edef68
2015-04-30 13:46:46 +00:00
Adrian Crum d82005c958 Use String constant instead of hard-coded value.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676975 13f79535-47bb-0310-9956-ffa450edef68
2015-04-30 12:42:17 +00:00
Adrian Crum ec9d5d5416 Small fixup for my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676974 13f79535-47bb-0310-9956-ffa450edef68
2015-04-30 12:41:26 +00:00
Adrian Crum ef710ed02f Some work on ComponentLoaderConfig.java:
1. Thread safety
2. Optimization
3. Code cleanup
4. Improved error handling

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676970 13f79535-47bb-0310-9956-ffa450edef68
2015-04-30 12:12:17 +00:00
Adrian Crum f322e1ca88 Optimization: move array creation outside loop so it is created only once.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676953 13f79535-47bb-0310-9956-ffa450edef68
2015-04-30 10:32:40 +00:00
Adrian Crum 4d01ad0289 JavaDoc fix and remove debug code. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676947 13f79535-47bb-0310-9956-ffa450edef68
2015-04-30 10:17:03 +00:00
Adrian Crum 2d37c15a48 Remove some code comments that were accidentally copied to new files.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676942 13f79535-47bb-0310-9956-ffa450edef68
2015-04-30 09:56:34 +00:00
Adrian Crum 0cae1a3571 Small fixup for my last commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676749 13f79535-47bb-0310-9956-ffa450edef68
2015-04-29 14:17:14 +00:00
Adrian Crum c2de699ca6 Fixed some bugs in startup code (https://issues.apache.org/jira/browse/OFBIZ-6268):
1. Class path loading was ignoring component settings, so class paths for disabled components were being loaded.
2. Configuration files were parsed twice.
3. Potential problem with unloading a loader that failed loading.

I was unable to test Cobertura because the necessary class (org.ofbiz.base.config.CoberturaInstrumenter) isn't being compiled for some reason.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676746 13f79535-47bb-0310-9956-ffa450edef68
2015-04-29 13:52:27 +00:00
Adrian Crum cd4f6cdbb3 Fixed a bug in UtilMisc.java where the List returned by the availableLocales() method included an empty Locale - causing errors in FreeMarker templates.
https://issues.apache.org/jira/browse/OFBIZ-6309

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676674 13f79535-47bb-0310-9956-ffa450edef68
2015-04-29 06:10:01 +00:00
Adam Heath 2dd530a51e Remove uesless exclusion of ofbiz crypto class compilation.
This was based on the availabily of javax.crypto.Cipher, which became
standard in java 1.4.  We require 1.7.  This is very old.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1676154 13f79535-47bb-0310-9956-ffa450edef68
2015-04-26 23:30:20 +00:00