Commit Graph
10472 Commits
Author SHA1 Message Date
Hans Bakker 91d206a71d add the possibility of adding tags to products next to having keywords to products, can also optionally approve/reject via a status field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1222544 13f79535-47bb-0310-9956-ffa450edef68
2011-12-23 03:49:11 +00:00
Jacques Le Roux 456eb16137 A modified patch from Patrick Antivackis "Null values are not synchronized in http mode" https://issues.apache.org/jira/browse/OFBIZ-4602
In order to send over http the values to create, store and remove, Ofbiz is Xml serializing the values. GenericValue xml serialization is managed in GenericEntity.makeXmlElement, unfortunately this method just don't serialized null valued fields.
To solve this issue, I managed null value the same way GenericEntity.setString (which is used for the Xml deserializing). I only managed until case 10, because i'm not sure the setString for the cases 11 to 15 are well managed (not taking care of null value) 

jleroux: After looking at GenericEntity.setString and initial commit (http://svn.ofbiz.org/viewcvs?rev=7779&view=rev) I see no reasons to not handling cases under 10 the same way. So I added these cases as well using fall through.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1222241 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 14:14:57 +00:00
Jacques Le Roux 6eaf5b54e4 A slightly modified patch from Patrick Antivackis "Entity synchronization is skipping values to create, store and remove" https://issues.apache.org/jira/browse/OFBIZ-4601
assembleValuesTocreate, assembleValuesToStore and assembleKeysToRemove are called multiple times during a synchronization (depending on the syncSplitMillis and the time period to synchronized). There is in theses methods a check to see if at the next call, the method needs to look for values. This check depends only on entity without values at the current run, which is not enough

Solving issue described and fixing the assembleKeysToRemove that was using nextUpdateTxTime instead of nextRemoveTxTime

jleroux: functional changes from patch, only formatting

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1222105 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 09:06:18 +00:00
Jacques Le Roux 97d79c74f4 A patch from Leila Mekika "Use-when not working on multi-forms submit button" https://issues.apache.org/jira/browse/OFBIZ-4605
The submit button of a form multi is rendered even if we add a use-when condition

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1221913 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 22:24:58 +00:00
Erwan de Ferrieres 10f612c5e9 OFBIZ-4487 - enable definition for position on sortfield - patch from Youssef Khaye and Olivier Heintz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1220927 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 20:16:01 +00:00
Jacques Le Roux fb5d588fb3 A patch from andrewzn "Help screen/navigation do not take into account content expiration" https://issues.apache.org/jira/browse/OFBIZ-4626
Help screens use entity-and to retrieve ContentAssoc without fromDate/truDate conditions while help content expiration still may be useful.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1220527 13f79535-47bb-0310-9956-ffa450edef68
2011-12-18 20:24:48 +00:00
Jacopo Cappellato 1c1421887a Added missing property needed to successfully run test cases in platforms with locales different from en.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1215142 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 14:22:01 +00:00
Jacopo Cappellato 172d49de9b Improved ui flow for "run service" requests: when an error occurs it returns to the "run service" screen instead of the "submit job" screen (OFBIZ-3571)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1214680 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 10:00:12 +00:00
Sascha Rodekamp 242ba72077 Wrong errorMessage output from minilang event (https://issues.apache.org/jira/browse/OFBIZ-3461) A patch from Dimitri Unruh: when a service returns an errormessagelist to a simple method event, the message list is formatted just as a string.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1214212 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 12:31:19 +00:00
Jacques Le Roux 046deacbe0 A patch from Wai https://issues.apache.org/jira/browse/OFBIZ-4620 "fail uploading audio/video files to database"
When uploading binary files (eg. image/audio/video) to the database, ofbiz throws a type casting exception because it is trying to type cast HeapByteBuffer to byte[].

I think the problem stems from configuring ofbiz to use java.nio.ByteBuffer and its subclass java.nio.HeapByteBuffer to contain uploaded binary data but no accommodation is made in the code to work with this type of object.

To test this, you need to set content.properties/content.upload.always.local.file=false
an use partymgr/control/viewprofile?partyId=admin and upload an image file.

java.nio.HeapByteBuffer comes from java's rt.jar (make sure your classpath includes this)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1214124 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 09:18:04 +00:00
Jacques Le Roux f663e9b57b Yesterday, late and in a hurry, I hastily committed r1212673. It was failing after an ant clean. But I did not see, because I did not do an ant clean, and Builbot did not report any issues (yes, I sometimes rely on it). Actually it was because Buildbot tests fails since r1212266, and it only sends info when it switches from bad to good, or vice-versa.
Fortunately, on my side, it was an easy fix: I just forgot to re-add the old strToMap(String str, boolean trim) signature.

So here it is

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1212749 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 08:55:27 +00:00
Hans Bakker 05909bfc1b revert 1212673 because of compile error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1212706 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 01:24:44 +00:00
Jacques Le Roux ade4ac0468 Improves StringUtil.strToMap() by adding a delimiter as parameter
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1212673 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 22:50:01 +00:00
Hans Bakker fc8b73c10c extend the <@ofbizUrl macro with a new parameter: webSiteId to be able to generate url's for a specific website in generated emails
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1211258 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 01:21:56 +00:00
Andrew Zeneski 11bcb7d52e reverted previous commit since it breaks SUN (oracle) JDK, ick.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1211088 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 20:25:52 +00:00
Andrew Zeneski 15228ae88b few minor changes to fix compiling with openjdk icetea6 1.7.9
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1211073 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 19:51:28 +00:00
Jacques Le Roux 5ac6c5f240 Better comment, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1209927 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 15:01:55 +00:00
Jacques Le Roux 992ef149ea A patch from Leon https://issues.apache.org/jira/browse/OFBIZ-4598 "set ACTIVATED_LOOKUP to null if there's no other lookup dialog open"
Set ACTIVATED_LOOKUP to null in lookup dialog "close" function when there's no other lookup dialog open, in case of some kind of wrong behavior during the opening process of a new lookup dialog.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1209362 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 05:37:17 +00:00
Jacques Le Roux 0b790e1661 A patch from Manuela Gruendlinger "renderDateTimeField does not allow to clear input field" https://issues.apache.org/jira/browse/OFBIZ-4595
Input fields rendered with renderDateTimeField cannot be cleared, the old value is always restored.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1209250 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 21:26:32 +00:00
Adrian Crum 3704ef9399 Moved screen rendering context initialization from the GlobalDecorator to a separate screen widget - so the initializations can be included in other decorators. Also cleaned up the GlobalDecorator formatting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1209054 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 12:41:03 +00:00
Hans Bakker e6cc17bed1 Return a 404 error and not redirect to control main in the ecommerce: https://issues.apache.org/jira/browse/OFBIZ-4390
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1208335 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 09:06:48 +00:00
Jacques Le Roux 258b31bb1b Replaces wrong jquery.hotkeys.js by jquery.hotkeys-0.7.9.js, as reported by Christoph Neuroth at https://issues.apache.org/jira/browse/OFBIZ-4594 "Broken JS file: jquery.hotkeys.js"
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1208277 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 04:57:05 +00:00
Sascha Rodekamp 9836b8f320 IMPROVEMENT: When creating a new product for a productId which already exists, an user unfriendly exception will be shown in the backend. I added a quick check to see that the ID is not in use, otherwise a user friendly error text will be shown.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1207891 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 14:49:44 +00:00
Hans Bakker 64befbc96a Revert 1205710 on a comment from Adrian
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1206043 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 02:59:40 +00:00
Adrian Crum a90a7cb45b Changed the behavior of screenlet title bar: Do not hide title bar controls when screenlet is collapsed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1206013 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 23:01:31 +00:00
Hans Bakker d4fa24f6a6 getDayEnd will have a null pointer exception when the offset is not provided. This can cause very strange behaviour in the system when people forget to enter a value in terms. When not provided zero is assumed now
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1205710 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 02:54:14 +00:00
Erwan de Ferrieres 4162e44a47 A patch from Youssef Khaye - OFBIZ-4573 - complex-alias does not allow to do (discountPercent * 100) as stated in xsd
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1205156 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 20:41:14 +00:00
Hans Bakker 81efa2aa64 problem with multiple virtual hosts in tomcat 7 contribution by Chatree https://issues.apache.org/jira/browse/OFBIZ-4571
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1204920 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 11:05:22 +00:00
Adrian Crum d603c617b8 Fixed bug in htmlFormMacroLibrary.ftl - list navigation page size drop-down was ignoring the current setting.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1204170 13f79535-47bb-0310-9956-ffa450edef68
2011-11-20 13:44:33 +00:00
Jacques Le Roux c8c8c21521 Makes the response to ./stopofbiz.sh a bit more clear
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1203511 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 07:08:32 +00:00
Hans Bakker 6a52e4e75c upgrade tomcat from 6 -> 7 more detail at: https://issues.apache.org/jira/browse/OFBIZ-4563
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1203470 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 03:06:17 +00:00
Jacques Le Roux 27fb4a1990 A patch from Kiran Gawde https://issues.apache.org/jira/browse/OFBIZ-4568 "CommonUpdatingData is missing from CommonUiLabels"
When you try to update the address from eCommerce application (Profile->ManageAddress->Edit). It shows CommonUpdatingData at the top. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1203350 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 20:17:15 +00:00
Erwan de Ferrieres 858f807812 Moving from System.out.println to Debug.logInfo in RemoteRequest.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1202872 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 20:18:04 +00:00
Erwan de Ferrieres e8160c3c00 moving from while and iterators to for each in RemoteRequest.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1202870 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 20:07:36 +00:00
Erwan de Ferrieres cd830d3869 removing unused variable and useless return in RemoteRequest
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1202858 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 19:47:28 +00:00
Erwan de Ferrieres c93edc15e6 Removing useless commented code in RemoteRequest.java
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1202856 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 19:40:37 +00:00
Erwan de Ferrieres 347707f69c Removing unused and not related to OFBiz trunk method : RemoteRequest#login
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1202851 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 19:36:04 +00:00
Erwan de Ferrieres 82a2025c35 Correcting deprecated methods since migration to http-core 4.1.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1202849 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 19:30:34 +00:00
Hans Bakker 62b4f44ab3 update the form renderer. when a content url starts with http, do not prefix the url with the website url
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1202081 13f79535-47bb-0310-9956-ffa450edef68
2011-11-15 07:41:50 +00:00
Sascha Rodekamp 9a85b1ccf4 Missing german uiLabels (https://issues.apache.org/jira/browse/OFBIZ-4562) A patch from Dimitri Unruh: Some missing german labels and also some better translations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201656 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 10:16:33 +00:00
Jacques Le Roux 2a00b12b5c The ZH patch of Leon's patch "add datetimepicker language file for zh-CN, zh-HK, zh-TW, and an en one in order to avoid "jquery-ui-timepicker-en.js" not found error" https://issues.apache.org/jira/browse/OFBIZ-4555
1. add datetimepicker language file to system: jquery-ui-timepicker-zh-CN.js, jquery-ui-timepicker-zh-HK.js and jquery-ui-timepicker-zh-TW.js.

jleroux: This time all is looking code. I viewed Chinese characters in WinMerge, but no in Scite, so I used using UTF8 encoding there and saved. Then was looking good in Toirtoise svn merge editor, and still good also in WinMerge (which certainly handled automatically the conversion 1st time, pfew... ;o)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201257 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 13:17:57 +00:00
Jacques Le Roux e2054c2734 Related to the patch from Leon again "add datetimepicker language file for zh-CN, zh-HK, zh-TW, and an en one in order to avoid "jquery-ui-timepicker-en.js" not found error" https://issues.apache.org/jira/browse/OFBIZ-4555
1. add datetimepicker language file to system: jquery-ui-timepicker-zh-CN.js, jquery-ui-timepicker-zh-HK.js and jquery-ui-timepicker-zh-TW.js.

jleroux: previous "the js files were wrongly encoded, UTF8-BOM solved the issue" was note enough (not easy to spot). Removes this wrong encoded file to add new clean files. I think it was my error last time: those file are new, and should be removed and added again with the right encoding, safer way!


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201256 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 13:08:14 +00:00
Jacques Le Roux 8bc67f9e74 Reverts 1201229 and reapplies patch from Leon "add datetimepicker language file for zh-CN, zh-HK, zh-TW, and an en one in order to avoid "jquery-ui-timepicker-en.js" not found error" https://issues.apache.org/jira/browse/OFBIZ-4555
1. add datetimepicker language file to system: jquery-ui-timepicker-zh-CN.js, jquery-ui-timepicker-zh-HK.js and jquery-ui-timepicker-zh-TW.js.
2. also add a "jquery-ui-timepicker-en.js" file, it's the default datetimepicker language file but not exist now.
3. run service "createJsLanguageFileMapping" to update sLanguageFileMapping.java accordingly.

jleroux: the js files were wrongly encoded, UTF8-BOM solved the issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201247 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 11:33:03 +00:00
Adrian Crum 0e9a239c4f View entity bug fix provided by Anne Jessel - https://issues.apache.org/jira/browse/OFBIZ-4393.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201232 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 09:41:56 +00:00
Jacques Le Roux 6d839bb4a5 A patch from Leon "add datetimepicker language file for zh-CN, zh-HK, zh-TW, and an en one in order to avoid "jquery-ui-timepicker-en.js" not found error" https://issues.apache.org/jira/browse/OFBIZ-4555
1. add datetimepicker language file to system: jquery-ui-timepicker-zh-CN.js, jquery-ui-timepicker-zh-HK.js and jquery-ui-timepicker-zh-TW.js.
2. also add a "jquery-ui-timepicker-en.js" file, it's the default datetimepicker language file but not exist now.
3. run service "createJsLanguageFileMapping" to update sLanguageFileMapping.java accordingly.

jleroux: not sure "jquery-ui-timepicker-en.js" is really needed, but cleaner for sure

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201229 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 09:31:49 +00:00
Jacques Le Roux 1626222154 Fixes some errors recently introduced in labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1201122 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 00:34:18 +00:00
Sascha Rodekamp db199e87d8 IMPROVEMENT: Replace String == null with UtilValidate.isEmpty() (https://issues.apache.org/jira/browse/OFBIZ-4546). A patch from Dimitri Unruh: In UtilDateTime are some String == null comparisons. I replaces them with UtilValidate.isEmpty()
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1200231 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 09:15:01 +00:00
Adrian Crum c1381a112d UtilFormatOut.java date and date-time format methods provided by Dimitri Unruh, with JavaDocs added by me - https://issues.apache.org/jira/browse/OFBIZ-4545.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1199793 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 15:26:53 +00:00
Sascha Rodekamp 91ffcbdae6 Update jQuery:
jQuery library to version 1.7
jQuery UI to version 1.8.16
jQuery Validation to version 1.9
jQuery Flot to version 0.7
jQuery datetimepicker to version 0.9.7
and jsTree

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1199218 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 12:35:33 +00:00
Hans Bakker aa3d73675b also introduce keyword size limit(configurable) in product and move property setting to content component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1199130 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 07:02:16 +00:00