Commit Graph
2222 Commits
Author SHA1 Message Date
Hans Bakker 60d3edace0 add general.properties setting for default rounding and precision in convertUom service
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1126364 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 07:54:32 +00:00
Marco Risaliti 77cc4d7ac7 Remove some unused variable into JsLanguageFileMappingCreator
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1125961 13f79535-47bb-0310-9956-ffa450edef68
2011-05-22 13:29:48 +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
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 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
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
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
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 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
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 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 à   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
Jacques Le Roux 44c9cbd00a A patch from Leon "Add "MUNICIPALITY" to getStateList's search condition to make "municipality" of china visible in state list" https://issues.apache.org/jira/browse/OFBIZ-4258
In china, city like "Shanghai","Beijing", "Chongqin" and "Tianjin" is municipality which is equivalent to province, but there's no such municipality in the state list displayed in client end.
In Geo entity, these municipalities is stored with geoTypeId="MUNICIPALITY", So I add it as a new search condition to CommonWorkers.getStateList to fix this issue.

Fixes some problem in current GeoData_CN.xml

Also changes the geoTypeId from "REGIONS" to "MUNICIPALITY" for some "Autonomous regions" and "Special administrative Regions" and add some missing country-state associations.
It's better to add new geo types for "Autonomous regions" or "Special Administrative Regions", but I don't want to make the thing complex if there's no such strong demand.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1094505 13f79535-47bb-0310-9956-ffa450edef68
2011-04-18 12:02:47 +00:00
Christian Geisert e9f7f30441 Improvement of german Labels
See OFBIZ-4195
Submitted by Konstantin N.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1092353 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14 15:49:13 +00:00
Erwan de Ferrieres 3db3ebd0a1 A patch from Seweryn Niemiec, GeoData for Poland OFBIZ-4253
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1092320 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14 15:01:00 +00:00
Bruno Busco eacce00908 Enabled column sorting in ListSecurityGroupUserLogins and ListUserLogins forms.
Added a userLoginId hyperlink in the ListSecurityGroupUserLogins form.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1091486 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 15:55:09 +00:00
Bruno Busco 7e6f33b66e Simpler markup (removed nested table tags) for rendering the available portlets list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1091482 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 15:52:05 +00:00
Bruno Busco 5296fe401f Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1091478 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 15:45:58 +00:00
Bruno Busco 122b3cfd0b Added a new "passwordChange" common request that allows to any user to change its own password.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090857 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 17:57:27 +00:00
Bruno Busco 6603db6900 Added new parameter "requirePasswordChange" to the "updateUserLoginSecurity" service.
When resetting a user password it is now possible to force the password change again.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090855 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 17:54:39 +00:00
Bruno Busco 1636b18950 Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090829 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 16:56:47 +00:00
Bruno Busco 58db81e34f Removed title attribute from form field so that the related FormFieldTitle label is used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090778 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 11:21:55 +00:00
Bruno Busco 55bdc0c53b Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090777 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 11:20:37 +00:00
Bruno Busco 7a31e37a11 Added several missing FormFieldTitle for userLogin entity
Better new Italian labels

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090776 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 11:19:48 +00:00
Bruno Busco e5e4b73a82 Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090757 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 10:08:08 +00:00
Sascha Rodekamp fb880c80a1 Update - i18n from DateTime display fields (https://issues.apache.org/jira/browse/OFBIZ-4014). Ofbiz can now show and interprete i18n dates and times. The Patch uses the datejs library to i18n the displayd date and time fields from the datepicker this works vice versa.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1090231 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 13:05:42 +00:00
Sascha Rodekamp c1e2a81191 Update - jQuery UI to version 1.8.11. The current jQuery UI Version is build on jQuery version 1.5.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1088549 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 10:42:28 +00:00
Sascha Rodekamp 7cc04db7d3 Update - Update to jQuery Version 1.5.2, the new version fixes some bugs in the library.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1088502 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04 08:36:05 +00:00
Hans Bakker e7692574ec More and extended geo data for china
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1086881 13f79535-47bb-0310-9956-ffa450edef68
2011-03-30 09:32:08 +00:00
Hans Bakker 65d7832c14 patch provided by Eric de Maulde OFBIZ-4217: Scaling image for every size type from ImageProperties.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1085275 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 07:57:46 +00:00
Sascha Rodekamp e11f878458 Update - Update the jQuery library to version 1.5.1. A few changes were necessary for this step. I updated the jQuery flot library to the current release, because the old one doesn't work with the new jQuery version, i also updated the jsTree Plugin to make it work with the new jQuery Version.
Note in jQuery 1.5 the implementation of the ajax function has been changed.

For more Information have a look at: http://blog.jquery.com/2011/01/31/jquery-15-released/


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082916 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 13:37:29 +00:00
Sascha Rodekamp 6b6a8c145d Update - Update to jQuery 1.4.4, Fix a bug in the fieldlookup.js to make it work with the new jQuery lib. This patch is to orepare the update to jQuery version 1.5.1
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082227 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 17:25:15 +00:00
Adrian Crum 67931c000a Removed a framework dependency on the Party component. Framework-only tests pass now.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082146 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 13:40:22 +00:00
Adrian Crum 7bfd621b6f Removed framework dependency on the Party component, introduced in rev 897842.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082017 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 00:48:56 +00:00
Adrian Crum be4e05447a Removed a framework dependency on the Content component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082016 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 00:46:40 +00:00
Adrian Crum 050ef03215 Partially revert a change made in rev 894330 - put multi-column screen elements back in the GlobalDecorator.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1082004 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 23:49:07 +00:00
Erwan de Ferrieres d7ad06b90c Adding a masked input capability to the date fields, use mask=Y and the field type will be taken for it. jQuery pPlugin is from http://digitalbush.com/projects/masked-input-plugin/ and under a MIT license
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1081333 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 11:15:24 +00:00
Marco Risaliti d0953abc06 Remove a reduntant cast warning in PreferenceServices (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1081065 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13 09:31:40 +00:00
Marco Risaliti 7f185d94bd Revert my previous rev. 1080348 as Adrian suggested in dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1080361 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 21:37:14 +00:00
Marco Risaliti e9813594a8 Italian translation of CommonEmptyHeader that is no more translated
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1080348 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 21:02:35 +00:00
Andrew Zeneski 56ef519342 two new features added to the autocomplete lookups:
1. pass searchDistinct will set the distinct flag on the entity options
2. list of condition field values are ORed together (key = value1 OR key = value2 etc)
 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1079427 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 16:43:25 +00:00
Marco Risaliti ba9e9c7deb Remove a warning in CommonEvents (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1078133 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 21:07:30 +00:00
Erwan de Ferrieres 4017a2c224 can now display a help document associated to a content. Examples coming next week
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1078046 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 16:40:56 +00:00
Erwan de Ferrieres fba839327f Adding a new field to portalPage helpContentId so we can associate a help screen to a portalPage
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1077932 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 13:26:46 +00:00
Erwan de Ferrieres 1ed0922fdf Adding a missing uiLabel CommonSelectPortletToHelp
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1076533 13f79535-47bb-0310-9956-ffa450edef68
2011-03-03 06:24:49 +00:00
Erwan de Ferrieres ef1e6723bc Removing duplicate title when displaying help, as the screenlet title has already the same label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1076255 13f79535-47bb-0310-9956-ffa450edef68
2011-03-02 15:33:40 +00:00
Erwan de Ferrieres db367fe9c9 Typo in ui*L*abelMap.CommonExtHelpTitle + French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1076173 13f79535-47bb-0310-9956-ffa450edef68
2011-03-02 11:28:09 +00:00