Commit Graph
10472 Commits
Author SHA1 Message Date
Hans Bakker ea2222d73d make the ecommerce 'contactus' not require login, add captcha and will try to match entered email address to party, whennot create the party.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1052449 13f79535-47bb-0310-9956-ffa450edef68
2010-12-24 05:45:19 +00:00
Hans Bakker a31572006b several improvements and completion of the email contactlist subscribe and unsubscribe functions.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1052447 13f79535-47bb-0310-9956-ffa450edef68
2010-12-24 04:37:20 +00:00
Adrian Crum 0dbf101802 Moved the security-related CRUD services to the common component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1052389 13f79535-47bb-0310-9956-ffa450edef68
2010-12-23 21:58:04 +00:00
Jacques Le Roux 40c5ceef00 A patch from Chatree Srichart "Duplicate _LAST_VIEW_NAME_ query string in renderLookupField macro" (https://issues.apache.org/jira/browse/OFBIZ-4072) - OFBIZ-4072
Problem in renderLookupField macro: duplicates LAST_VIEW_NAME query string when it's already in ajaxURL . This problem causes the request handler to not convert LAST_VIEW_NAME parameter to String because it would be List. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1052245 13f79535-47bb-0310-9956-ffa450edef68
2010-12-23 12:45:32 +00:00
Scott Gray fd0fa0c636 OFBIZ-4071 - menu-item's disable-if-empty attribute was not being handled, fixed by using the existing unused method to check if the item should be disabled and if true then applying the disabled style and not rendering the hyperlink portion of the child link (if present). Based on a slightly modified patch and report from Deepak Dixit, thanks Deepak.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1052195 13f79535-47bb-0310-9956-ffa450edef68
2010-12-23 08:05:33 +00:00
Marco Risaliti b6466fe13e Remove a duplicated label key
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1052081 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 22:00:03 +00:00
Marco Risaliti bc4a6bc27d Replace some fail-message to fail-property tag example component (OFBIZ-1874)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1052054 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 19:55:14 +00:00
Marco Risaliti 47d750084c Replace some fail-message to fail-property tag all entityext/example components (OFBIZ-1874)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1052050 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 19:51:55 +00:00
Marco Risaliti 082963b486 Replace some fail-message to fail-property tag all common components (OFBIZ-1874)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1052045 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 19:39:45 +00:00
Jacques Le Roux f6cf21be04 Complete r1051462 (We don't need this whole block if there are no descriptions. It looks better in UI: no scrawls around the lookup button, notably when the description is empty) in case of the old style lookup (where a false description <script type="text/javascript">\r\n</script> is passed in because of an empty result in fieldlookup.js for <<if (result.split("ajaxAutocompleteOptions.ftl -->")[1]) {>>
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1051602 13f79535-47bb-0310-9956-ffa450edef68
2010-12-21 18:33:44 +00:00
Jacques Le Roux 5df7d81104 A patch from BJ Freeman "Add help document (docbook) support to the create-component ant target" (https://issues.apache.org/jira/browse/OFBIZ-4070) - OFBIZ-4070
Creates the data/helpdata and document directories. Copy templates for each folder.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1051477 13f79535-47bb-0310-9956-ffa450edef68
2010-12-21 12:49:41 +00:00
Jacques Le Roux 35cfde7df7 We don't need this whole block if there are no descriptions. It looks better in UI: no scrawls around the lookup button, notably when the description is empty
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1051462 13f79535-47bb-0310-9956-ffa450edef68
2010-12-21 11:33:50 +00:00
Adrian Crum e4d3a1758e Moved remaining security UI artifacts to the common component. This commit introduces a minor dependency from framework/common to applications/party - which will be fixed in a future commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050936 13f79535-47bb-0310-9956-ffa450edef68
2010-12-19 19:10:50 +00:00
Erwan de Ferrieres a7b967d48b Using ivy for downloading PostgreSQL driver
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050927 13f79535-47bb-0310-9956-ffa450edef68
2010-12-19 18:14:50 +00:00
Erwan de Ferrieres adbf783134 Adding ivy to OFBiz and make an example with cobertura. No more errors when running tests.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050915 13f79535-47bb-0310-9956-ffa450edef68
2010-12-19 17:38:57 +00:00
Adrian Crum 9596919a91 Moved user login UI artifacts from the Party component to the Common component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050766 13f79535-47bb-0310-9956-ffa450edef68
2010-12-19 06:07:53 +00:00
Adrian Crum 652c0b8e4a Moved some ServerHitBin seed data from application/content to framework/common. This change will accommodate a framework-only installation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050457 13f79535-47bb-0310-9956-ffa450edef68
2010-12-17 17:55:36 +00:00
Jacques Le Roux 26fcb9eb4c I think this is the correct solution for the problem I temporarily fixed some hours ago (r1050364+r1050367: was for a blocking deadlock issue, see https://issues.apache.org/jira/browse/OFBIZ-4065 - OFBIZ-4065 for details)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050452 13f79535-47bb-0310-9956-ffa450edef68
2010-12-17 17:04:27 +00:00
Jacques Le Roux 159aaa42e9 Temporary(?) fix, follows r1050364
(r1050364 was for a blocking deadlock issue, see https://issues.apache.org/jira/browse/OFBIZ-4065 - OFBIZ-4065)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050367 13f79535-47bb-0310-9956-ffa450edef68
2010-12-17 12:51:55 +00:00
Jacques Le Roux 95ec1c0d52 Temporary(?) fix for a blocking deadlock issue, see https://issues.apache.org/jira/browse/OFBIZ-4065 - OFBIZ-4065
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050364 13f79535-47bb-0310-9956-ffa450edef68
2010-12-17 12:28:27 +00:00
Christian Geisert 2d501d0876 Log if there's a problem (i.e. invalid XML) when loading XML-Properties
see OFBIZ-4045
submitted by Georg Koester

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050186 13f79535-47bb-0310-9956-ffa450edef68
2010-12-16 21:56:14 +00:00
Adrian Crum 39611c4c9f Moved some security related demo data from the applications/securityext folder to the framework/security folder. This change accommodates logging in as admin in a framework-only demo installation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1050053 13f79535-47bb-0310-9956-ffa450edef68
2010-12-16 16:45:47 +00:00
Erwan de Ferrieres 9502bf228d Upgrading to the latest Apache Derby version (10.7.1.1) - changelog is at http://db.apache.org/derby/releases/release-10.7.1.1.cgi
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1049712 13f79535-47bb-0310-9956-ffa450edef68
2010-12-15 21:13:46 +00:00
Erwan de Ferrieres 38b593c652 OK, this one was a bad move. Reverting 1045337, until a better solution is found
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1049540 13f79535-47bb-0310-9956-ffa450edef68
2010-12-15 13:23:18 +00:00
Jacques Le Roux 2cfecd4b40 A patch from Sascha Rodekamp "Update jsTree to RC3" (https://issues.apache.org/jira/browse/OFBIZ-4058) - OFBIZ-4058
Few changes in jsTree, some adds the checkbox tree mode and Drag'n'Drop behaviour. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1049154 13f79535-47bb-0310-9956-ffa450edef68
2010-12-14 16:42:05 +00:00
Jacques Le Roux 4736420673 A patch from Sascha Rodekamp "Update the Datepicker to version 0.9.1" (https://issues.apache.org/jira/browse/OFBIZ-4056) - OFBIZ-4056
Updates the timepicker. Seems that it's more stable and they fixed a few issues. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1049151 13f79535-47bb-0310-9956-ffa450edef68
2010-12-14 16:39:30 +00:00
Jacques Le Roux e5aa59f9c6 Test on Java 5 is not needed anymore in trunk, R10.04 and R9.04 as at least Java 5 is needed (and even Java 6 for the trunk)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1049031 13f79535-47bb-0310-9956-ffa450edef68
2010-12-14 10:53:46 +00:00
Erwan de Ferrieres a184533cdd Removing an unneeded line cut
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1045340 13f79535-47bb-0310-9956-ffa450edef68
2010-12-13 19:48:10 +00:00
Erwan de Ferrieres b2eafb444a Adding enumerations for the conf-mode and use-private elements. Those are used for include-portal-page. This way we can use the parameters and the file is still valid
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1045337 13f79535-47bb-0310-9956-ffa450edef68
2010-12-13 19:44:54 +00:00
Erwan de Ferrieres a6dd0f7566 When displaying a portal page, the page title wasn't displayed. It also now shows near the breadcrumbs end
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1045328 13f79535-47bb-0310-9956-ffa450edef68
2010-12-13 19:27:36 +00:00
Scott Gray 2ecc4b2494 Removed unnecessary SuppressWarnings annotations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044932 13f79535-47bb-0310-9956-ffa450edef68
2010-12-12 21:31:51 +00:00
Scott Gray 47f43a302a Remove unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044931 13f79535-47bb-0310-9956-ffa450edef68
2010-12-12 21:31:27 +00:00
Scott Gray dbaed85112 Remove unreachable catch block
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044918 13f79535-47bb-0310-9956-ffa450edef68
2010-12-12 20:43:13 +00:00
Scott Gray 75b0b1c1e3 Remove unnecessary semicolons
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044917 13f79535-47bb-0310-9956-ffa450edef68
2010-12-12 20:43:03 +00:00
Scott Gray bdd23c22d5 Add missing override annotations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044913 13f79535-47bb-0310-9956-ffa450edef68
2010-12-12 20:41:27 +00:00
Jacques Le Roux 97ac568b9a A patch from Dukian (actually done by hand was easier, got an UTF8 issue)
There are many different i18n file naming approaches for language.country couple. For Traditional Chinese ... OFBiz uses java way: zh_TW, datepicker uses zh-TW, and el-rte needs this patch. It uses actually zh_tw, see the full version line 1108:

Dukian will file this issue to el-rte project too.

At r1044611 I 1st committed in jQyery branch, an habit to loose..

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044615 13f79535-47bb-0310-9956-ffa450edef68
2010-12-11 09:46:07 +00:00
Jacques Le Roux 1539f888c0 Fix a small bug introduced with r1044132 for OFBIZ-4051 i18n for elrte editor. It was crashing renderTextareaField when called from forms
Also while at it renames visualEdtiorEnalble to visualEditorEnable

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044510 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 21:00:06 +00:00
Jacques Le Roux 24fe5ff37e Merges the jQuery branch back to the trunk
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044503 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 20:40:08 +00:00
Adam Heath a2fd254167 Make FreeMarkerWorker.getWrappedObject auto-cast to whatever type the
caller wants.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044232 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 07:21:09 +00:00
Adam Heath d61ce6486f Move variable declarations until they are actually used, instead of
assigning null, then force-reassigning the real value later.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044230 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 07:20:49 +00:00
Adam Heath 90c849bb36 Remove unnecessary cast when fetching the compiled template from the
UtilCache cache.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044229 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 07:20:42 +00:00
Adam Heath 762a3b6630 Fix some spacing issues, no code changes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044228 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 07:20:35 +00:00
Adam Heath 2f6217251a Set svn:eol-style properly on all java files. This needs to be done on other text files as well, but that would cause undo conflicts in the jquery branch(due to .js being heavily modified there). Also, some files were committed to the repository with DOS line endings; those are fixed as well.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1044202 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 02:40:02 +00:00
Hans Bakker 05770c2fcd OFBIZ-4046: Adding chapter on Datafiles to docbooks. Contribution by BJ Freeman
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1043266 13f79535-47bb-0310-9956-ffa450edef68
2010-12-08 01:14:57 +00:00
Andrew Zeneski 0c211fb4e9 implemented option to specific a specific entity should NOT be checked; no columns are to be updated and ignore any warning about fields, relations, keys, etc. This is useful when an entity is defined based on a database view; the view may not (or probably will not) appear in the table meta data and any attempt to auto-create the entity will (or should) fail.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1042792 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 21:07:48 +00:00
Jacques Le Roux 9679d72618 A patch from Anne Jessel "Is Empty for text-find widget broken" (https://issues.apache.org/jira/browse/OFBIZ-4025) - OFBIZ-4025
To reproduce:
    * go to Facility, Inventory Items tab (or any form that uses text-find widget)
    * choose "Is Empty" from drop-down next to Product Id
    * click Find button

Expected behaviour: no matching items listed, as all items have a Product Id.
Observed behaviour: all items match.

Problem is caused by find code assuming that there is no entity condition to be created if the text field is empty, but of course Is Empty is
different to the other operators in that the text field is expected to be empty.

The attached patch adds a special check for the Is Empty operator.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1042396 13f79535-47bb-0310-9956-ffa450edef68
2010-12-05 18:43:44 +00:00
Jacques Le Roux 8cf126e7f5 A patch from Anne Jessel "Collapse all broken if hyperlink in pane" (https://issues.apache.org/jira/browse/OFBIZ-4022) - OFBIZ-4022
To reproduce the bug:
    * edit the EditProduct form in applications/product/widget/catalog/ProductForms.xml
    * add a new field with a hyperlink sub-element.
    * refer to this new field in the first, non-collapsible field-group in the sort-order
    * go to this page in the UI (edit a product in the catalog)
    * the Expand All and Collapse All buttons do not work properly

The problem is caused by the javascript finding the added hyperlink field in the first field-group, and incorrectly assuming it is
the expand/collapse link for the field-group. This causes the javascript to crash when it gets a null reference to an enclosing li element.

It is not specific to the EditProduct form, but applies to any group of collapsible panes where one contains a hyperlink.

The attached patch simply checks that the li element actually exists.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1042348 13f79535-47bb-0310-9956-ffa450edef68
2010-12-05 13:37:07 +00:00
Scott Gray f4159d4294 In GenericDAO.selectListIteratorByCondition(...) the order of the select fields wasn't being maintained. This causes problems later on if the EntityListIterator needs to perform a count query where the select field ordering is important for distinct queries (particularly for the likes of postgres which doesn't support SELECT COUNT(DISTINCT *) which can result if the first field is an aggregate).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1042280 13f79535-47bb-0310-9956-ffa450edef68
2010-12-05 04:26:43 +00:00
Bruno Busco 25965626af Reverted revision 1042196 as suggested by Adam.
This change introduces framework dependencies from applications.
More work is needed to the patch in https://issues.apache.org/jira/browse/OFBIZ-4037 before committing again.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1042250 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 22:29:33 +00:00
Bruno Busco 587e93ba82 https://issues.apache.org/jira/browse/OFBIZ-4037
Moved the feature that allows a new user to register for an account from MyPortal to the framework so that it is available in any application.
It has also been slightly reworked (code cleaning and internationalization).
Two flags in general.properties allows to configure if the register function must be enabled or not and if the captcha function should be used.
The captcha function needs to be improved because at the moment the code is contained in an hidden field so that it is very easy for a computer to bypass it.
A possible fix for this could be to put the MD5 coding of the captcha code in the hidden field.
Then the event that checks the code should compare the MD5 codes.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1042196 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 14:58:18 +00:00