Commit Graph
5984 Commits
Author SHA1 Message Date
Adam Heath 92bf6d030d OPTIMIZE: The help method now takes a PrintStream parameter, to which the help is
sent.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139862 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 18:08:20 +00:00
Adam Heath 2e30fc08d2 OPTIMIZE: Move help printing to separate method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139861 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 18:08:15 +00:00
Adam Heath 8fba300516 FIX: When the rhs was an EntityFieldValue, the wrong model field was being
checked(it was checking the left field).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139856 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 18:07:44 +00:00
Adam Heath de833d793f FIX: Fix rendering of forms that have no fields defined.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139855 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 18:07:38 +00:00
Adam Heath 62e143afa2 OPTIMIZE: Turn off some additional debug log calls for
catalina-related sources.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139853 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 18:07:29 +00:00
Adam Heath 7047b2b80b FEATURE: Add support to Debug.logFoo() for using %-style format
strings.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139852 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 18:07:24 +00:00
Adam Heath 0653d3a7d1 FEATURE: When doing bulk creation of tables, foreign key indices,
and declared indices, do the work in parallel.  Also, when the database
does not support wildcard looking of primary key info, do the per-table
lookup in parallel.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139851 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 18:07:18 +00:00
Hans Bakker 7e07ec7ad5 improve log messages (add domainname)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139703 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 03:11:17 +00:00
Adam Heath 1af60a7143 FEATURE: Add a thread pool to GenericHelper; this is per datasource.
Nothing makes use of this yet.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139700 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 02:50:49 +00:00
Adam Heath 07e802c9d8 FEATURE: Add helper method to fetch the results of all futures in a
collection, into a new list.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139699 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 02:50:41 +00:00
Adam Heath 276ecca353 FEATURE: Allow the ThreadGroup to be specified for created threads.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139698 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 02:50:35 +00:00
Adam Heath cb0f5a3b46 FEATURE: if the threadCount passed to getExecutor is negative, then use
the abs() value of that times the number of cpus, to specify the actual
number of threads.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139697 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 02:50:29 +00:00
Adam Heath 22ebafd3de FEATURE: Add a flag to getExecutor that specifies whether to prestart
the threads in the pool.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139696 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 02:50:23 +00:00
Adam Heath 2a0c3c3fc7 OPTIMIZE: getExecutor now calls createThreadFactory, instead of creating
one itself.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139695 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 02:50:17 +00:00
Adam Heath afd1a0a945 FIX: Print an error message when a path component that is added doesn't
actually exist.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139694 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 02:50:11 +00:00
Adam Heath 97ec62675c FIX: Filter out hidden library files(and prevent recursing into hidden
folders).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139692 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 02:49:57 +00:00
Adam Heath f30de08afd FIX: Add framework/sql to api unit tests.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139687 13f79535-47bb-0310-9956-ffa450edef68
2011-06-26 02:49:33 +00:00
Scott Gray 603e1504fe OFBIZ-4306 fix bug reported by Gaudin Pierre. The datejs library's Date.parse(string) method doesn't work very well, seems to just guess at what format to use. Switch to using the parseExact(date, format) method instead.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139521 13f79535-47bb-0310-9956-ffa450edef68
2011-06-25 11:13:33 +00:00
Adam Heath 920ed26326 Fix broken 1078215, the object instance variable was removed, because
dumb smart code editors thought it was unused.  Please understand the
code you change.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139396 13f79535-47bb-0310-9956-ffa450edef68
2011-06-24 18:16:55 +00:00
Jacques Le Roux 4853449c25 A patch from Nicolas Malin <<Display dateTime field with input method time-dropdown not use context value to display hour and minutes>> https://issues.apache.org/jira/browse/OFBIZ-4319
If you define a dateTime field like that :

<field name="estimatedStartDate"><date-time input-method="time-dropdown" step="10"/></field>
and pass in context : estimatedStartDate = "2011-06-016 20:30:00"
when you edit the form, estimatedStartDate takes the good value 2011-06-016 on date, but takes nowTimestamps.hour for dropdown hour instead of 20 and nowTimestamps.minutes for dropdown minutes instead of 30

To test the patch :

    go to ofbiz example component with given date : "https://localhost:8443/example/control/FormWidgetExamples?field4=2001-01-01 02:21:000"
    the field 4 must have hour to 02 and minutes to 21

The patch also corrects multiple definition : sr.append("\" value=\"");
and removes unneeded escape at end line : if (UtilValidate.isEmpty(requiredStyle)) requiredStyle = "required";



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139385 13f79535-47bb-0310-9956-ffa450edef68
2011-06-24 17:33:25 +00:00
Erwan de Ferrieres 1b0f365f82 A patch from Stephane Ducas - OFBIZ-4324 - When creating a customer from the shopping cart the selected country has to be the default one
I slightly modified your patch and put the defaultCountryGeoId in CommonScreens.xml#countries so the geoId will always be filled


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1139291 13f79535-47bb-0310-9956-ffa450edef68
2011-06-24 13:13:44 +00:00
Jacques Le Roux 8a9e10952f With Adrian's last changes at r1138575 this is no longer needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1138661 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 22:16:03 +00:00
Adrian Crum af5b6cfd1c Small fixup for my previous commit.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1138575 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 18:40:50 +00:00
Jacques Le Roux 742c554817 By moving formName and fieldFormName in parameters order r1138485 broke the current OOTB code which still uses htmlTemplate.lookupField
There is still an issue: the lookup button does not show

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1138569 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 18:01:52 +00:00
Adrian Crum 3fc434f86c More work on the renderLookupField Freemarker macro: Improved documentation, provide default values for optional parameters, jQuery bug fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1138485 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 14:39:06 +00:00
Jacques Le Roux e94051396b Fixes a bug reported by someone on main OFBiz wiki page (will be removed from there)
=======================================================================
ajax FieldLookup bug for ofbiz 11.04
showDescription="false" is not work
you should add the code in [selectall.js] file
method "function ajaxAutoCompleter(areaCsvString, showDescription, defaultMinLength, formName){"

at header:
{code:title=selectall.js|borderStyle=solid}
////////////////////////////////////////////////////////////
 if(typeof(showDescription)=="string"){
  showDescription = showDescription== "false"? false : true;
 }
////////////////////////////////////////////////////////////
{code}

then it will be work.
=======================================================================


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1138463 13f79535-47bb-0310-9956-ffa450edef68
2011-06-22 13:47:14 +00:00
Adrian Crum 7ec4134b8a Documentation for the renderLookupField Freemarker macro.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1137603 13f79535-47bb-0310-9956-ffa450edef68
2011-06-20 12:00:39 +00:00
Jacques Le Roux dd7e1be1c1 A patch from Leon <<"setUserPreference" goes to main page instead last view if current form includes any lookup field>> https://issues.apache.org/jira/browse/OFBIZ-4313
When I open a form which include lookup field and then click the expand/collapse button around the upper right corner in the the header, the page will go to "main" after user preference is settled.

The cause is the requests initiated by lookup field does not remember the last view name. It simply use "main" instead.

Patch to make lookup requests remember the LAST_VIEW_NAME correctly.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1137433 13f79535-47bb-0310-9956-ffa450edef68
2011-06-19 20:59:35 +00:00
Jacques Le Roux 7a9e80e6ef A patch from Leon "Trivial patch to ModelViewEntity class to make view entity able to handle entity condition between field from one entity and another" https://issues.apache.org/jira/browse/OFBIZ-4321
In view entity definition, we can use <condition-expr> to create a filter condition between field and some value using specific operator. It should be also possible to make condition between field and rel-field through some kind operator. Such as:

<view-entity entity-name="xxx" package-name="xxx">
        ...
        <entity-condition>
            <condition-expr entity-alias="A" field-name="a" operator="equals" rel-entity-alias="B" rel-field-name="b"  />
        </entity-condition>
    </view-entity>

But there's a trivial defect in current ModelViewEntity which prevent this case working.

} else if ( value == null && (operator.equals(EntityOperator.EQUALS) || operator.equals(EntityOperator.NOT_EQUAL))) {
                return EntityCondition.makeCondition(lhs, UtilGenerics.<EntityComparisonOperator<?,?>>cast(operator), null);
            } else {

In the above code extracted from ModelViewEntity, it does not consider the condition that the relField could be defined when value==null.

JLR:I checked that || should not be used in <<value == null && this.relFieldName>>, it was not obvious to me but is correct

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1137201 13f79535-47bb-0310-9956-ffa450edef68
2011-06-18 15:17:22 +00:00
Erwan de Ferrieres 32b5ffb11f Better French translation for CommonPortalPagesForApplication
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1136854 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 12:10:14 +00:00
Erwan de Ferrieres e1c4ec0c5d when sorting on more than 1 criteria, only the last one was used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1136833 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 10:06:50 +00:00
Erwan de Ferrieres 15c1cc682c Wrong attribute was used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1136831 13f79535-47bb-0310-9956-ffa450edef68
2011-06-17 10:01:52 +00:00
Sascha Rodekamp 207e6630f2 wrong link href of leaf node in a tree element (https://issues.apache.org/jira/browse/OFBIZ-4315).
A slightly modified patch from Leon which corrects the href tag of empty leaf nodes.

OrigMsg:
like department and employee tree in main page of human resource management application, if you click the expand/collpase link of a leaf node, the wrong request error occurs. Since there's a empty link href value set for leaf node, browser will treat it as the request "https://.../humanres/control".


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1135929 13f79535-47bb-0310-9956-ffa450edef68
2011-06-15 06:21:19 +00:00
Jacques Le Roux b4d7f50233 Closes "Login out on a cluster handled by DeltaManager causes a NPE" https://issues.apache.org/jira/browse/OFBIZ-4289
It works locally but not on clusters. You simply get a NPE.

Problem
    When we logout we cross an issue due to Tomcat sessions persistence.
    Because we set distributable to true, to allow sessions failover,
    and use and DeltaManager for replication.
    Delegator and other main Classes (notably Dispatcher) are not serialized in OFBiz. This is the origin of the problem

Tried solutions
By default DeltaManager save active sessions on disk. It uses a private String variable pathname for that (default to "SESSIONS.ser"). You can set it to null, to avoid session persistence, using a context.xml file in the WEB-INF folder with content like below. But I tried it in webtools app on staging qs001 (only) and it did not work (with distributable set to false). And we have no other means to set it from OFBiz (OOTB).

<Context>
     <Manager className="org.apache.catalina.session.DeltatManager" pathname="">
     </Manager>
</Context>



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1132749 13f79535-47bb-0310-9956-ffa450edef68
2011-06-06 20:26:35 +00:00
Jacques Le Roux c60e0e0388 Were missing in r1098100
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1132496 13f79535-47bb-0310-9956-ffa450edef68
2011-06-05 21:36:00 +00:00
Jacques Le Roux 7ad5584e0d Revert r948761 I introduced for https://issues.apache.org/jira/browse/OFBIZ-3784.
It introduced an issue when you edit a WebsSte and add a content secure prefix

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1131396 13f79535-47bb-0310-9956-ffa450edef68
2011-06-04 13:37:52 +00:00
Jacques Le Roux e6539dc8fc Closes "JmsTopicListener started twice when distributed-cache-clear is active" reported by Martin Kreidenweis at https://issues.apache.org/jira/browse/OFBIZ-4296
Simply avoid to start a JMS Listener thread from Job Manager when DCC is on. Then set it back to previous value.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1131144 13f79535-47bb-0310-9956-ffa450edef68
2011-06-03 19:05:07 +00:00
Hans Bakker 7a1dfe1464 update to the catalog/category tree: works now with IE and is using Ajax to update the middle section using the tree
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1130415 13f79535-47bb-0310-9956-ffa450edef68
2011-06-02 06:22:03 +00:00
Erwan de Ferrieres 30ac5d9102 Adding help text when displaying a field, code directly copied from MacroFormRenderer.renderFieldTitle
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1129877 13f79535-47bb-0310-9956-ffa450edef68
2011-05-31 19:37:39 +00:00
Jacques Le Roux 2b17d17651 A patch from Leon "The absence of default delay value for ajaxAutoCompleter introduces html syntax error in client end" https://issues.apache.org/jira/browse/OFBIZ-4305
When I 1st wrote this I used delay instead of defaultDelay. I then changed the name but forgot to change in widget.properties file. I wanted to keep it commented out to have default value commented out (Convention over configuration) but it would be more complicated and anyway would not follow how it's done in widget.properties

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1129036 13f79535-47bb-0310-9956-ffa450edef68
2011-05-30 08:02:48 +00:00
Marco Risaliti f5284f787a Fix a javadoc warning into ContainerLoader
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1128028 13f79535-47bb-0310-9956-ffa450edef68
2011-05-26 18:46:35 +00:00
Marco Risaliti acc8ecf6a3 Removed the method UtilNumber.stringToBigDecimal and the references in webpos component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1127651 13f79535-47bb-0310-9956-ffa450edef68
2011-05-25 19:45:44 +00:00
Marco Risaliti 9178f9ec3f Removed some javadoc warning (wrong param/return) into security component no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1127281 13f79535-47bb-0310-9956-ffa450edef68
2011-05-24 20:57:33 +00:00
Marco Risaliti 49559c94dc Removed some javadoc warning (wrong param/return) into entityext component no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1127256 13f79535-47bb-0310-9956-ffa450edef68
2011-05-24 20:13:33 +00:00
Hans Bakker 66d25fea52 To be consistsent with product and the storage of alternative url, this function replaces the 'link' button on the category. We also improved the locale lookup with a search function
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1126904 13f79535-47bb-0310-9956-ffa450edef68
2011-05-24 07:30:42 +00:00
Marco Risaliti 56f315b3e5 Removed some javadoc warning (wrong param/return) into widget component no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1126754 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 21:17:30 +00:00
Marco Risaliti 32269601a2 Removed some javadoc warning (wrong param/return) into webtools component no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1126748 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 21:01:53 +00:00
Marco Risaliti 1a16c98e54 Removed some javadoc warning (wrong param/return) into webapp component no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1126744 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 20:57:44 +00:00
Marco Risaliti a57455cac4 Removed some javadoc warning (wrong param/return) into testtools component no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1126734 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 20:44:02 +00:00
Marco Risaliti b11b9cc02d Removed some javadoc warning (wrong param/return) into service component no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1126729 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 20:38:36 +00:00