Commit Graph
10472 Commits
Author SHA1 Message Date
Marco Risaliti cce5004d88 add a @SuppressWarnings("unchecked") due to Freemarker api
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1125953 13f79535-47bb-0310-9956-ffa450edef68
2011-05-22 13:17:38 +00:00
Marco Risaliti c4c446369c Webpos2 improved version (OFBIZ-4287)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1125951 13f79535-47bb-0310-9956-ffa450edef68
2011-05-22 13:11:17 +00:00
Sascha Rodekamp 4a6091c1a0 Update - myportal d'n'd it is now possible to select text on a portlet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1124747 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 13:26:12 +00:00
Sascha Rodekamp 23d8737b1d Update to jQuery UI Version 1.8.13
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1124697 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 11:59:43 +00:00
Sascha Rodekamp 27e16a61c9 Update - jQuery update to version 1.6.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1124336 13f79535-47bb-0310-9956-ffa450edef68
2011-05-18 16:54:55 +00:00
Hans Bakker 4a1e4429eb add a lookup locale function
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1124153 13f79535-47bb-0310-9956-ffa450edef68
2011-05-18 09:53:07 +00:00
Jacques Le Roux 0bc35e7275 A patch from Martin Kreidenweis "NullPointerException in GenericDelegator during testMode rollback" https://issues.apache.org/jira/browse/OFBIZ-4284
Test mode rollback doesn't work right in GenericDelegator for calls to removeByPrimary() key and removeByValue() when the row to be deleted didn't exist in the first place. It creates a TestOperation with a null value and subsequently fails to create that during rollback.

First, the TestOperation shouldn't be created at all. Second, if null is passed to GenericDelegator.create() it tries to handle this, but fails with a NullPointerException.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1104423 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17 17:25:52 +00:00
Jacques Le Roux 87f0cfbb36 I got caught by this typo on a production cluster:
XmlFileLoader: File file:.....framework/entity/config/entityengine.xml process fatal error. Line: 686. Error message: Invalid byte 2 of 2-byte UTF-8 sequence.

After having manually put back the line modified by an automatically applied patch, I got this  mis-representation. Not sure why, and anyway had no chances to think about it (certainly due to a difference on how UTF-8 was represented on these servers and on my machine - XP with Putty and SSH)

So I remove this weirdness to prevent future possible nervous crises ;o)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1104173 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17 11:54:11 +00:00
Erwan de Ferrieres 07a566932d Upgrading derby to 10.8.1.2 - changelog is here http://db.apache.org/derby/releases/release-10.8.1.2.cgi
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1103767 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 15:27:39 +00:00
Sascha Rodekamp 8fbb3b2ecc parse javascript link wrongly in lookup layer dialog if there's slash '/' in data (https://issues.apache.org/jira/browse/OFBIZ-4281)
e.g. in lookup dialog (in layer mode), one href value of a link is "javascript:set_value('123/ABC');", then the ofbiz framework will parse it to "javascript:lookupAjaxRequest('ABC'');&presentation=layer')". It's wrong. Correct one should be given href itself.

to fix:
judge whether the link contains "javascript:set_" before split it by slash '/'.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1103714 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 12:23:14 +00:00
Jacques Le Roux da9f389cb5 A small change to more easily see current pending jobs and possibly cancel some others while canceling one manually
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1103667 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 10:03:39 +00:00
Hans Bakker 6e4d8af85a part revert of 1102615. although valid syntax it does not work without it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1103597 13f79535-47bb-0310-9956-ffa450edef68
2011-05-16 02:35:02 +00:00
Sascha Rodekamp 6e8d61e42f after session timeout, ajax popup dialogbox shows ofbiz login screen (https://issues.apache.org/jira/browse/OFBIZ-4256).
If the session is timed out the request handler checks weather it is an ajax request or not (The information comes from the request header if the X-Requested-With contains XMLHttpRequest we haven an ajax request.).
If it is an ajax request it don't return the normal "checkLogin" request, i return a a special ajaxCheckLogin request. This request can point to an site which shows the "Please Login Hint".

Orig Msg:
Take the following page (for example) https://localhost/content/control/findContent

field "Data Resource Id" has an icon beside it that creates an ajax dialog pop up. If the session has already timed out. The dialog box would show the login screen.

I suspect that all pages containing this functionality would exhibit the same symptom.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1102615 13f79535-47bb-0310-9956-ffa450edef68
2011-05-13 08:52:15 +00:00
Sascha Rodekamp 797e4caad6 localization for jQuery validate plugin is not working (https://issues.apache.org/jira/browse/OFBIZ-4275). This patch enabels the i18n file loading for the validation plugin.
Orig Msg.
the validate plugin is not using the localized files.
Everything needed seems to be there.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1102597 13f79535-47bb-0310-9956-ffa450edef68
2011-05-13 08:06:05 +00:00
Jacques Le Roux c35abeb2cd Adds ant-contrib-1.0b3.jar
Replaces the <if> task (used javascript in a file with .py suffix :/ ). I kept it commented out for now, in case someone is using it (not used OOTB)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1100795 13f79535-47bb-0310-9956-ffa450edef68
2011-05-08 19:18:27 +00:00
Jacques Le Roux 5c8fbb779d Fix the comment of the not-null attribute (field element)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1100729 13f79535-47bb-0310-9956-ffa450edef68
2011-05-08 13:01:30 +00:00
Jacques Le Roux f72c067344 Closes <<Caching is used by org.ofbiz.webapp.control.ProtectViewWorker(line 68) for UserLoginAndProtectedView (since changeset r1075350), but the view has set never-cache="true">> reported by Jonas Hoef at https://issues.apache.org/jira/browse/OFBIZ-4243
I wondered if I should not remove the event from the common-controller since I guess this is rarely used. But, as the functionality is available OOTB, I preferred to keep it as is. So I simply remove the never-cache from  UserLoginAndProtectedView view-entity. Since it will almost always be empty, no memory issues and better performance are expected. If I remember well, at the moment I committed this, I checked: the performance impact was already not noticeable (most of the time only one check in the event).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1100197 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 13:07:18 +00:00
Jacques Le Roux 2653806a87 Fixes some other forgotten formatting issues in previous commit (r1100130). And Mostly removes an useless duplicated snippet
<<A patch from Philippe Mouawad "ResourceBundleMapWrapper memory usage improvement" https://issues.apache.org/jira/browse/OFBIZ-4268

Patch that creates the Map only when it is required>>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1100138 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 08:53:52 +00:00
Jacques Le Roux cc7ee5ea71 Fixes some forgotten formatting issues in previous commit (r1100127). Due to tabs in patch.
<<A patch from Philippe Mouawad "ResourceBundleMapWrapper memory usage improvement" https://issues.apache.org/jira/browse/OFBIZ-4268

Patch that creates the Map only when it is required>>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1100130 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 08:23:43 +00:00
Jacques Le Roux 9516b43bc7 A patch from Philippe Mouawad "ResourceBundleMapWrapper memory usage improvement" https://issues.apache.org/jira/browse/OFBIZ-4268
Patch that creates the Map only when it is required

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1100127 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 08:17:17 +00:00
Jacques Le Roux f90dcae786 Add an explicit comment about use-indices-unique="false" which is needed because of Derby bug with null values in a unique index
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1099727 13f79535-47bb-0310-9956-ffa450edef68
2011-05-05 09:09:39 +00:00
Jacques Le Roux a1389bd8cf Fixes a data type issue introduced recently (works in R10.04 and R9.04). I did not take the time to analysis the problem further, but I expect the same issue may appear with the same condition: ie a DB field type NUMERIC and an entity.field of type Integer used in a service, switching to Long lazily solves the issue.
Actually in R10.04 the problem is reported as a warning but the service is not rolled back. Not sure if it's a desired change (then how to use Integer as field type in an entity also used by a service?)

GenericEntity.java:426:WARN ]
---- exception report ----------------------------------------------------------
=-=-=-=-=-=-=-=-= Database type warning GenericEntity.set =-=-=-=-=-=-=-=-= In entity field [ProtectedView.maxHits] set the value passed in [java.lang.Integer] is not compatible with the Java type of the fiel
d [Long]
Exception: java.lang.Exception
Message: Location of database type warning
---- stack trace ---------------------------------------------------------------
java.lang.Exception: Location of database type warning
org.ofbiz.entity.GenericEntity.set(GenericEntity.java:426)
org.ofbiz.entity.GenericEntity.set(GenericEntity.java:372)
org.ofbiz.entity.GenericEntity.setAllFields(GenericEntity.java:906)
org.ofbiz.entity.GenericEntity.setNonPKFields(GenericEntity.java:862)
org.ofbiz.service.engine.EntityAutoEngine.runSync(EntityAutoEngine.java:235)
org.ofbiz.service.ModelServiceReader$GenericInvokerImpl.runSync(ModelServiceReader.java:832)
_$gen.file_58$.D_58$.workspace.ofbizDev.framework.common.servicedef.services_95$security_46$xml_35$addProtectedViewToSecurityGroup.runSync(file:/D:/workspace/ofbizDev/framework/common/servicedef/services_secu
rity.xml#addProtectedViewToSecurityGroup:95)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1099388 13f79535-47bb-0310-9956-ffa450edef68
2011-05-04 10:00:57 +00:00
Hans Bakker e174cd5cb2 collapse portlet was not remembered
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1099345 13f79535-47bb-0310-9956-ffa450edef68
2011-05-04 07:13:21 +00:00
Jacques Le Roux f85384c1fe Related to r1099244 "Default delay for ajaxAutoCompleter". I forgot some pieces of the puzzle. When I manually quickly tested it worked but of course I did not test all cases. This should be OK now
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1099270 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 21:32:03 +00:00
Jacques Le Roux a26341cf1b Default delay for ajaxAutoCompleter
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1099244 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 21:03:11 +00:00
Jacques Le Roux 545e828855 This is actually default values, better to keep them commented out as Chris Snow noticed some time ago in dev ml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098795 13f79535-47bb-0310-9956-ffa450edef68
2011-05-02 21:20:37 +00:00
Sascha Rodekamp 8283436080 Update - Enable the portal D'n'D only on the portlet Headers as discussed in the ML.
OrigMsg.: from Pierre
I'm trying "my portal" page at "https://127.0.0.1:8443/salesreps/control/showPortalPage?portalPageId=SalesRepsMgmt" and i find a strange behaviour... When you try to copy a label or something on a widget you can't do it because it start dragging the form...

May be I forget something but I do not understand why you can drag forms in the final view. Should it be possible only in admin view ? 
 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098671 13f79535-47bb-0310-9956-ffa450edef68
2011-05-02 17:25:51 +00:00
Sascha Rodekamp 5081061679 Update - Added a new datejs language i18n file for danish date/time conversion.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098578 13f79535-47bb-0310-9956-ffa450edef68
2011-05-02 14:03:56 +00:00
Bruno Busco 92f3bd0b8b Reverted the page title removal I did on rev 1098406 as suggested by Adrian.
Used the proper "page-title" class style.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098481 13f79535-47bb-0310-9956-ffa450edef68
2011-05-02 05:22:05 +00:00
Bruno Busco 16b7b4ce3e Better Italian label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098407 13f79535-47bb-0310-9956-ffa450edef68
2011-05-01 20:39:38 +00:00
Bruno Busco 258ace98d6 No funtional changes only layout.
Screenlet title bars and H1 titles have been removed when they simply duplicate the tab menu.
Fixed some missing tab menu highlighting.





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098406 13f79535-47bb-0310-9956-ffa450edef68
2011-05-01 20:38:38 +00:00
Jacques Le Roux 2df3f75f70 We have got this issue on trunk demo server (it works locally but fails on server)
[javac16] Compiling 20 source files to /home/ofbiz/trunk/framework/testtools/build/classes
  [javac16] /home/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/ModelTestSuite.java💯 addTestSuite(java.lang.Class<? extends junit.framework.TestCase>) in junit.framework.TestSuite cannot be applied to (java.lang.Class<capture#618 of ?>)
  [javac16]                 suite.addTestSuite(clz);

This change allows to compile on trunk demo server

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098245 13f79535-47bb-0310-9956-ffa450edef68
2011-05-01 10:14:59 +00:00
Ashish Vijaywargiya 257a7f4b7a Applied patch(missing template file content) from jira issue - OFBIZ-4267. Thanks Deepak.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098100 13f79535-47bb-0310-9956-ffa450edef68
2011-04-30 11:26:12 +00:00
Ashish Vijaywargiya 17f4cac6a0 Applied patch from jira issue OFBIZ-4267. Disabled attribute for lookup field should be readonly.
Lookup tag has a attribute "disabled" that is used to set disabled="disabled" property for lookup input element and it create also a clear button just after lookup field to clear the field value.
But if we set disabled="disabled" for any input field then that field does not passes as parameter and we can't accesses it from parameters or request parameters , so it should be "readonly". 
If we set readonly-"readonly" then user can't change the field value directly, and this field passes as parameters.
Only difference between readonly and disabled is that in case of disabled field does not passes as parameter buy in case of readonly field passes as a parameter.
Thanks Deepak for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1098082 13f79535-47bb-0310-9956-ffa450edef68
2011-04-30 09:05:20 +00:00
Erwan de Ferrieres ee08fe25a2 Removing old and not used lib in birt, 2.6.0 is used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1097841 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 15:30:54 +00:00
Adrian Crum 891bc676f7 Updated HttpClient library to version 4.1. The newer version has a number of bug fixes and security fixes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1097827 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 14:54:50 +00:00
Adrian Crum f635a84fcb Small code cleanup in Base64.java - no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1097824 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 14:46:18 +00:00
Jacques Le Roux 0f99d5d983 I did it wrong in r1094600 and just noticed
<<Slight improvement to prevent false error messages when putting spaces in readers names, eg after commas for instance>>




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1097712 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 07:43:56 +00:00
Hans Bakker bc6503960a Update imagemanagement:
- move remove and rename function to manage page
- create UI label and error UI label
- improve remove function
- improve rejected function
- improve share image function

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1097674 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 03:08:59 +00:00
Jacques Le Roux 2b97e68c4f Put a doc about this unimplemented tag. A guy in the team thought it could rely on it for data loading order.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1097382 13f79535-47bb-0310-9956-ffa450edef68
2011-04-28 09:40:43 +00:00
Erwan de Ferrieres bfc158dc67 A patch from Pierre Gaudin - error in pagination target with on-event-update-area parameters - OFBIZ-4249
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1096871 13f79535-47bb-0310-9956-ffa450edef68
2011-04-26 19:43:01 +00:00
Jacques Le Roux 18fcf5b74a A patch from Nicolas Malin "Add famfamfam icons has generic and add possibility to surchage" https://issues.apache.org/jira/browse/OFBIZ-4259
JLR: Reopened because it should follow https://cwiki.apache.org/OFBADMIN/html-and-css-best-practices.html or provide another solution

Nicolas: First quick step, I remove img on menu. Second step, I begin a reflexion to improve my enchancement (see msg in dev ML)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1096457 13f79535-47bb-0310-9956-ffa450edef68
2011-04-25 11:08:32 +00:00
Sascha Rodekamp 6a0bbb1040 Bug - Next, Last, Previous and First functions are broken in lookup dialog (https://issues.apache.org/jira/browse/OFBIZ-4261) There was a bug in the interpretation of the next, last, prev link.
Orig. Msg.
When I open an layer mode lookup window and click the 'Next' button above the search result list, nothing happend but exception occures in backend. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1096344 13f79535-47bb-0310-9956-ffa450edef68
2011-04-24 16:32:16 +00:00
Jacques Le Roux 13e570bcbf A patch from Nicolas Malin "Enhanced way of displaying "missing/incorrect fields"" https://issues.apache.org/jira/browse/OFBIZ-2132
Initial demand by Michael Pätzold
At the moment we concentrate on increasing the usability of the backend application. One thing we recognized is the way form errors are reported to the users. Now it's done by showing a list of entity fields, that are required. A more common approach would be to highlight the form controls, that were not/wrongly filled. Was/Is there any task related to that or something similar?

Nicolas's solution
With integration of JQuery and validate function integrate by Sascha, I extend the Form renderer to apply required class and alert the form when she submitted to pass by JQuery validate function.

JLR: I have added a required field to InternalName field in Edit Product Form. There are maybe other cases like that which should be improved...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1096293 13f79535-47bb-0310-9956-ffa450edef68
2011-04-24 09:48:59 +00:00
Jacques Le Roux 849f4016e5 A patch from Nicolas Malin "Add LookupPortalPage on common components" https://issues.apache.org/jira/browse/OFBIZ-4260
To test :

    * apply patch
    * apply patch from OFBiz-4262
    * load seed
    * Go to example and add examplePortlet2 to an example pagePortal
    * Edit examplePortlet2

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1096290 13f79535-47bb-0310-9956-ffa450edef68
2011-04-24 09:35:28 +00:00
Jacques Le Roux 5bb2f3a420 A patch from Nicolas Malin "getImageLocation generates NullPointer" https://issues.apache.org/jira/browse/OFBIZ-4262
When you use auto-field-entity on a form , you get a nullPointer :

java.lang.NullPointerException
org.ofbiz.widget.form.ModelFormField$DisplayField.getImageLocation(ModelFormField.java:2122)
org.ofbiz.widget.form.MacroFormRenderer.renderDisplayField(MacroFormRenderer.java:193)
org.ofbiz.widget.form.ModelFormField$DisplayField.renderFieldString(ModelFormField.java:2104)
org.ofbiz.widget.form.ModelFormField.renderFieldString(ModelFormField.java:600)
org.ofbiz.widget.form.ModelForm.renderItemRow(ModelForm.java:1707)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1096140 13f79535-47bb-0310-9956-ffa450edef68
2011-04-23 13:07:21 +00:00
Jacques Le Roux 3210eea160 Nicolas forgot this in his patch and it did not showed unless you made a clean up before building. Complete r1095984, related to https://issues.apache.org/jira/browse/OFBIZ-4259
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1096083 13f79535-47bb-0310-9956-ffa450edef68
2011-04-22 23:19:38 +00:00
Jacques Le Roux 48c6114143 A patch from Nicolas Malin "Add famfamfam icons has generic and add possibility to surchage" https://issues.apache.org/jira/browse/OFBIZ-4259
Adds the possibility to use famfamfam icons contained in framework/images/webapp/images/famfamfam/icons.
If you want use a specific icon, it's possible to define an attribute VT_ICONS_LOC that contains the location to themes icons directory to use
It improves form rendering to pass a flexible string on image-location attribute and screen and form renderer to display an image with a text.

JLR: I just added à &nbsp; before menus texts

After Erwan's remark I wondered If I should remove the CSS on buttons. But I finally found that it was complementary. Because when no image is used on a specific button you still have the default CSS style applied (typical for Add buttons as Erwan outlined). And when no default CSS style is applied you can have an image like now shown OTTB on print button when editing an Example. So I see these 2 features as complementary for now. Maybe one day, one will replace the other, but at this stage both are welcome IMO.

BTW the famfamfam (strange name ;o) icons lib is well done and really full of possibilities...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1095984 13f79535-47bb-0310-9956-ffa450edef68
2011-04-22 18:51:10 +00:00
Hans Bakker c136195d23 Using Amazon EC2 loadbalancer which already decrypted to http, content should still be served https so checking for X-Forwarded-Proto request variable too
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1095859 13f79535-47bb-0310-9956-ffa450edef68
2011-04-22 02:40:37 +00:00
Adrian Crum edbcc68dcd New feature: i18n entity descriptions in Web Tools. New feature demonstrated in Example component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1095037 13f79535-47bb-0310-9956-ffa450edef68
2011-04-19 11:23:07 +00:00