Commit Graph
2222 Commits
Author SHA1 Message Date
Jacques Le Roux 1c972bf684 Fixes https://issues.apache.org/jira/browse/OFBIZ-4652 "The Label Manager is wrongly overriding CommonEmptyHeader"
* Adds a keepSpace boolean to UtilXml.writeXmlDocument(), this allows to use xsl:preserve-space into UtilXml.createOutputTransformer()
* Uses it into SaveLabelsToXmlFile.saveLabelsToXmlFile()
* Adds some French labels into CommonUiLabels.xml using Labels Manager to test the new functionality 
* Adds the xml:space attribute into the valueType complexType
* Adds the ofbiz-properties.xsd schema into the base-catalog.xml

I got an issue when 1st trying to commit: 
Commit failed (details follow):
While preparing
 'D:\workspace\ofbizClean\framework\common\config\CommonUiLabels.xml' for commit
Inconsistent line ending style

So I forced the EOLs to my locale platform value (Win XP)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338831 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 19:03:26 +00:00
Jacopo Cappellato 4b1ed290e1 Completed refactoring/cleanup of captcha implementation that now supports screens with more than one captcha in them.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338700 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 13:31:15 +00:00
Jacques Le Roux 2f5ddb1b12 A patch from Pierre Smits "Project resource overview doesn't show the resources with a thru-date before the current date." https://issues.apache.org/jira/browse/OFBIZ-4853
When a project manager expires the assignment of a resource by clicking the delete button in the Project Resources overview the resource is deleted from the overview. It should be that the resource is still shown in the overview with the tru-date visible.
Otherwise there will be a discrepancy between the overview of resources of the project and the project dashboard.
The name of the button is also wrong. It should state 'expire' not 'delete'.

jleroux: I have also created a new label FormFieldTitle_expireButton copying labels from CommonExpire. I saw that labels where not sorted at all so I used Labels Manager for that. I put back CommonEmptyHeaderby hand. I will soon fix this issue. So, apart the sort changes, there is also a lot of false changes in CommonUiLabels.xml because Labels Manager now uses the right way for Language Identification: http://www.w3.org/TR/REC-xml/#sec-lang-tag (ie a - separate language from country instead of previously a _)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338695 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 13:27:54 +00:00
Adam Heath 9e5f405a4d DEPRECATION: framework: findByAnd variants replaced with findByAnd that takes a boolean useCache parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1338403 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 20:59:54 +00:00
Adam Heath 64a9662c25 DEPRECATION: framework: findByPrimaryKey variants replaced with findOne
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337662 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 21:17:55 +00:00
Jacques Le Roux a60bc0b5d9 Moves the line
<set field="layoutSettings.suppressTab" value="ofbizsetup"/><!-- diseable ofbiz setup by default -->
from ApplicationDecorator to GlobalDecorator screen.

This in order to prevent showing the Setup application in all framework components (example, examplext, webtools) when demo data are loaded. 
No side effects when loading only extseed data, Setup always shows (logical and tested)



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337644 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 20:52:30 +00:00
Scott Gray 7f0893f8cd Deprecated org.ofbiz.common.Captcha
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337058 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 08:23:10 +00:00
Scott Gray 20047d5fe3 Copied the captcha image generator into a single event that streams the image to the response for a direct request rather than trying to store it during screen rendering to be served up later.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1337057 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 08:23:02 +00:00
Ashish Vijaywargiya e0971b304c Applied similar fix as we did on trunk r1300463.
On production systems you can't suppress Debug.log( message by the use of debug.properties file. It is always good to use Debug.* statements that are having log level setup in debug.properties file. The real problem comes with Debug.log( statement when you are printing any list or map object that contains so many records(or data) in it. Here I am changing all the occurrence of Debug.log( with Debug.logInfo(, Debug.logError( or Debug.logWarning( so that we can have better control of Debug.* statements on production system. :-)

Bad use of Debug statement. On production system you will get false alarm that you are having error in code base although the resultant statement is only giving additional information instead of error message.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335927 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 05:28:17 +00:00
Jacopo Cappellato 5b528efa2d First pass in fixing the buggy code for captcha support; this is a first pass (the next one will probably be to save the image in the session rather than in the file system); the main problems fixed are related to concurrent access: the class was not thread safe and this, especially in servers with high traffic, could cause a series of issues like:
* captcha images created and then lost
* captcha images created in the wrong location (for example out of the OFBiz folder)
* the folder runtime/tempfiles/captcha could be locked



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1335047 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 14:46:07 +00:00
Jacques Le Roux 80af13f2c1 Non functional changes. Removes useless exceptions catches.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334576 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 09:06:39 +00:00
Adam Heath 33101dbaa2 FEATURE/DEPRECATION: Deprecate HashCrypt.cryptPassword; previously,
it would call String.getBytes(), without specifying an encoding.  That
meant that the platform default encoding would be used, which might
change between different installs(if someone changed an environment
variable, for instance).  Now, there are explicit variants to be called.

When creating a new value, use cryptValueUTF8.  If, for some reason,
calling code is doing it's own comparison, it must continue to use
cryptValueBytes(password.getBytes()).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1334170 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 20:42:26 +00:00
Adam Heath b767ef1868 OPTIMIZE: Remove cryptPassword(String, String); it is not nescessary to
go thru a deprecation cycle for this, as this method was only recently
added, and has never been officially released.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1333664 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 22:20:24 +00:00
Adrian Crum d66f311eb7 Updated all Mini-language xml files to use the new schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328827 13f79535-47bb-0310-9956-ffa450edef68
2012-04-22 09:18:24 +00:00
Jacques Le Roux 986c1ae6ac A patch from Daniel Riquelme "Enable NOT-IN operator to performFind" https://issues.apache.org/jira/browse/OFBIZ-4815
This patch will enable NOT-IN operator to the performFind service.
Only two lines of the file framework/common/src/org/ofbiz/common/FindServices.java were modified to enable de NOT-IN operator.
An use case is provided to test

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328637 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 11:38:14 +00:00
Jacques Le Roux 567080a8e3 Fixes a NPE introduced at r1328122
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328226 13f79535-47bb-0310-9956-ffa450edef68
2012-04-20 06:59:06 +00:00
Jacques Le Roux 5e5f0e27a5 This introduces a mean to hide a service result in log (when the service is longer than 50 ms and Debug.timingOn() or > 200 ms and Debug.infoOn(), see ServiceDispatcher.java, just above line 600)
A hideResultInLog service attribute is added. If set to true the service result will be hidden from possible exposition in ServiceDispatcher.runSync() 
This is convenient when used for sending a password to an user (the password must be legible in the sent mail). 
I'm sure a lot of you would want to have no logs at all in production. But by experience I know that we need to log info in logs even in production. Especially when the system is quickly moving ahead...
So this is a sure mean to hide any password in logs, being current or backuped somewhere on the servers disks...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1328122 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 21:41:39 +00:00
Adam Heath f092508550 FEATURE: Make use of new HashCrypt cryptPassword functionality.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327741 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:49:22 +00:00
Adam Heath 3cea0258d0 OPTIMIZE: Refactored LoginServices.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327737 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 23:48:58 +00:00
Jacques Le Roux 2db2a99619 A modified patch from Wai "ajax autocomplete and dialog during session timeout" https://issues.apache.org/jira/browse/OFBIZ-4813
1. autocomplete feature shows the message "no records found" during a session timeout. This could be misleading for the user.
2. During a session timeout, clicking on ajax dialog button shows a large frame containing a message indicating session has timeout. Should show a more detailed message.

jleroux: what I adapted:
* Added <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> in htmlheader-for-ajax.ftl
* Replaced also spinner.gif in Tomahawk (better be consistent)
* Added a French label an kept those existing but English (improved by Wai)
* Removed the ajaxErrorText style in ajaxNotLoggedIn screen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1327502 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 13:24:30 +00:00
Christian Geisert 70939b1439 added/corrected a few German Labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326399 13f79535-47bb-0310-9956-ffa450edef68
2012-04-15 19:00:07 +00:00
Jacques Le Roux 6dec5661a3 Replaces ProductCountry and mostly PartyCountry by CommonCountry and merges all labels in CommonCountry
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1326270 13f79535-47bb-0310-9956-ffa450edef68
2012-04-15 08:24:45 +00:00
Christian Geisert 6881ce39aa Moved Swiss German ("Offerte") to de_CH labels
See OFBIZ-2862


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1325807 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 15:37:04 +00:00
Jacopo Cappellato 11f9742f58 Changes required after the test port changes introduced in rev. 1311214: now the tests should all pass.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1324614 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 07:58:15 +00:00
Jacques Le Roux 27822125e1 setCountryStatesEventJs.ftl was a specialisation of setDependentDropdownValuesJs.ftl introduced 2 years ago with it. It has never been used and finally whan I thnk about it I don't see any needs to keep (slim down spirit)
So this to remove it and clean duplicated references/comments about setDependentDropdownValuesJs.ftl

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1310954 13f79535-47bb-0310-9956-ffa450edef68
2012-04-08 05:19:48 +00:00
Jacques Le Roux 5709385ad6 Followed Scott"s suggestion and added a generic EMAIL_PASSWORD EmailTemplateSetting (used to send a new password at user request)
I finally kept also the previous way because it allow an easier 18n of at the email subject.

Still the same concern: OOTB, if the user has not set a SMPT server in general.properties for the defaultFromEmailAddress the message "A new password has been created and sent to you. Please check your Email." when actually nothing happens. But that's anyway user's responsibility

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1310716 13f79535-47bb-0310-9956-ffa450edef68
2012-04-07 09:17:41 +00:00
Jacques Le Roux 2ab258f919 A patch from BREMA Dev Team "email password broken" https://issues.apache.org/jira/browse/OFBIZ-3790
There is no productStoreId in the session for an user of a backend application, and ProductStoreEmailSetting is not available. This is the reason.
However we can use default template and default sender's address from general.properties in this case.
Also removes some dead code.

jleroux: this uses  "general.properties", "defaultFromEmailAddress". So to work correctly it still needs "defaultFromEmailAddress" (default =ofbiztest@example.com), "mail.smtp.relay.host" (default =localhost) and such to be set correctly... In other words the message "A new password has been created and sent to you. Please check your Email." could even more misleading if people are not aware about setting SMTP


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1307895 13f79535-47bb-0310-9956-ffa450edef68
2012-03-31 20:35:42 +00:00
Hans Bakker 2874803c43 property to either show currency decimals when zero or not
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1307303 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 08:29:28 +00:00
Jacques Le Roux 7c02c7829f Fixes 6 duplicated German labels
<value xml:lang="de">Termine</value>
<value xml:lang="de">Standard-Organisation</value>
<value xml:lang="de">Portlet-Attribute anpassen</value>
<value xml:lang="en">Persönliche Seite</value>
<value xml:lang="de">Kinder</value>
<value xml:lang="en">Portalseiten für die Anwendung</value>

And 1 duplicated English labels
<value xml:lang="en">Delivery to the following recipient(s) failed:</value>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1304240 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 09:13:13 +00:00
Jacques Le Roux 3214b476cb A patch from Tri Duc Vo "contribute Ofbiz Vietnamese tranlasting to community from HaNoi" https://issues.apache.org/jira/browse/OFBIZ-4627
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1304237 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 08:56:48 +00:00
Jacques Le Roux b427c4d000 Add ${errMessage} to CommonDatabaseProblem label, it was missing there
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1304206 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 06:35:53 +00:00
Ashish Vijaywargiya b0e153006c Bug fix, Applied patch from jira issue - OFBIZ-4734 - User behaviour issue on auto-completer.
Currently if user type in auto-completer text box and if matches found then list display as auto-completer result list but if no matches found then user didn't know that result will come or not, even no matches found.

Change behaviour is when user type in text box then spinner (ajax loader image) shows wchich tells user that search is in progress.
If matches found or not found spinner disapperars and reult/ no result message listed in auto-completer relsult list.
Now user won't see any abnormal behaviour at ui.

Added spinner image for the auto-completer request.
Also added the "No Records Found" message if no matches found for the auto-completer search.

Thanks Nitesh, Deepak and Rishi for the contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1303062 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 18:08:05 +00:00
Adrian Crum 48ac918030 Made the ScriptHelperImpl createServiceMap method behave more like mini-language. Error messages are saved in the result Map.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300965 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 12:58:46 +00:00
Adrian Crum ded0847a65 Simplified ContextHelper.java code by adding auto-creation of some commonly-used bindings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300954 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 12:26:50 +00:00
Adrian Crum 762466f309 Fix type-unsafe casts in ContextHelper.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300889 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 10:37:38 +00:00
Hans Bakker 25c5483493 make the currencyRounding a property variable, using the value which is hardcoded now. contribution of 'Tor'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300817 13f79535-47bb-0310-9956-ffa450edef68
2012-03-15 06:31:32 +00:00
Adrian Crum 203f5ee73d Improved JavaScriptTest.js file:
1. Fixed reference to application-level entity.
2. Made the behavior of the test function different from the behavior of global code - so the distinctions are clear in the service results.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1300469 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 06:40:55 +00:00
Hans Bakker 0372daa663 OFBIZ-4638: make ofbiz run with openjdk7,6. Contribution of Chattree
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1299985 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 06:50:41 +00:00
Adrian Crum fda9bad4cf More JSR-223 work - added a ScriptHelper object to the bindings. Also added a demonstration to the JavaScript test service.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1299924 13f79535-47bb-0310-9956-ffa450edef68
2012-03-12 23:20:55 +00:00
Adrian Crum 7f741eb700 Added a JSR-223 event handler.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1299131 13f79535-47bb-0310-9956-ffa450edef68
2012-03-10 01:38:15 +00:00
Adrian Crum d9f7ea2cd4 Restore service definition that was unintentionally removed in my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1298269 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 04:40:20 +00:00
Adrian Crum 2ba7468eff More JSR-223 work - added a bsh engine so that bsh-specific code can be eliminated. Bsh is now invoked using JSR-223.
The engine comes from http://java.net/projects/scripting. I had to modify the code slightly because the BshScriptEngine class implemented Compilable - but the Compilable methods were not implemented. So I removed implements Compilable. I renamed the jar to signify that the code has been modified.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1297478 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 14:06:13 +00:00
Adrian Crum 0a0903efb8 More JSR-223 work - added a generic script service engine.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1297323 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 02:16:29 +00:00
Adrian Crum dd56fdd30d Fixed Groovy test script. String constants were being returned as org.codehaus.groovy.runtime.GStringImpl instead of java.lang.String.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1297214 13f79535-47bb-0310-9956-ffa450edef68
2012-03-05 20:21:19 +00:00
Adrian Crum f4de5909bb Minor change to sendMailFromTemplateSetting service: Log message when no email address is found instead of throwing exception.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1294102 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 10:52:22 +00:00
Jacques Le Roux 642ebe11e6 A patch from Markus M. May "Adding German UI Labels on framework CommonUILabels" https://issues.apache.org/jira/browse/OFBIZ-3838
I'd like to have a review of this slighly modified patch (no labels changes) by a German speaking committer or contributor.
Because some labels are replaced and my German is not good enough (it's not good at all) to be able to take a decision by myself

Here are the points I'm unsure about

-        <value xml:lang="de">Forderungen</value>
+        <value xml:lang="de">Debitoren</value>

-        <value xml:lang="de">Klicken Sie hier</value>
+        <value xml:lang="de">Hier klicken</value>

-        <value xml:lang="de">Ansehen</value>
+        <value xml:lang="de">Suchen</value>

-        <value xml:lang="de">Neues Passwort (zur Überprüfung)</value>
+        <value xml:lang="de">Neues Passwort (Wiederholung)</value>

-        <value xml:lang="de">Erstellt von Benutzeranmeldung</value>
+        <value xml:lang="de">Erstellt von Benutzer</value>

-        <value xml:lang="de">Zuletzt geändert von Benutzeranmeldung</value>
+        <value xml:lang="de">Zuletzt geändert von Benutzer</value>



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1293232 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 12:50:08 +00:00
Jacques Le Roux 4eb4ae56e3 A patch from Markus M. May "Add german translation to TemporalExpressionUiLabels.xml" https://issues.apache.org/jira/browse/OFBIZ-4700
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1245130 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 19:26:39 +00:00
Adrian Crum 4a48104212 Add private constructors to static utility classes. Patch provided by Rishi Solanki - https://issues.apache.org/jira/browse/OFBIZ-4656.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1243364 13f79535-47bb-0310-9956-ffa450edef68
2012-02-12 23:19:33 +00:00
Hans Bakker 9de0762a42 make it possible that the applicable system settings in general properties can be overridded by settings in the database.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1240016 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 07:17:00 +00:00
Hans Bakker 57d7af2a63 update of system properties via entity:
- by default leave the values in the entity null
- use findOne method to get SystemProperty by primary key
- add check whether system property's value empty before using properties file
This change to make sure current users of a non tenant installation are not affected.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1239451 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 03:02:55 +00:00