details: https://code.openbravo.com/erp/devel/pi/rev/bd2a7adf0675
changeset: 13998:bd2a7adf0675
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Oct 17 17:29:45 2011 +0200
summary: Related to issue https://issues.openbravo.com/view.php?id=18781
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
| 8 ++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-linkbutton.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
| 24 ++++++---
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search-attribute.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-spinner.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-time.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-yesno.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-form-button.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js
| 12 +++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js
| 10 ++--
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js
| 7 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
| 18 +++++--
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
| 20 ++++---
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-tab.js
| 2 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-quickrun-widget.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-popups.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views-toolbar.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization-treegrid.js
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form-toolbar-button.js
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js
| 8 ++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-clone-order.js
| 2 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
| 17 +++---
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-history-manager.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-view-manager.js
| 5 +-
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/form/formitem/ob-formitem-widgetinform.js
| 2 +-
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-about-popup.js
| 2 +-
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
| 15 +++--
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
| 4 +-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js
| 2 +-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 10 ++--
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
| 2 +-
48 files changed, 145 insertions(+), 104 deletions(-)
diffs (truncated from 1161 to 300 lines):
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
Mon Oct 17 17:29:45 2011 +0200
@@ -83,7 +83,7 @@
},
getAlertRules: function() {
- post = {'eventType': 'getAlertRules' };
+ var post = {'eventType': 'getAlertRules' };
OB.RemoteCallManager.call('org.openbravo.client.application.AlertManagementActionHandler',
post, {}, function(rpcResponse, data, rpcRequest){
@@ -145,7 +145,7 @@
},
moveToStatus: function(alertIDs, oldStatus, newStatus) {
- post = {'eventType': 'moveToStatus',
+ var post = {'eventType': 'moveToStatus',
'oldStatus': oldStatus,
'newStatus': newStatus,
'alertIDs': alertIDs};
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js
Mon Oct 17 17:29:45 2011 +0200
@@ -70,7 +70,7 @@
this.obManualURL = obManualURL || '';
- this.tabTitle = tabTitle || null;
+ this.tabTitle = null;
OB.Layout.HistoryManager.updateHistory();
},
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
Mon Oct 17 17:29:45 2011 +0200
@@ -22,7 +22,7 @@
// in that it auto-completes while typing. A TODO: make this widget work the
same as the
// OBDateItem, autocomplete when blurring.
-isc.ClassFactory.defineClass('OBDateTimeItem', OBDateItem);
+isc.ClassFactory.defineClass('OBDateTimeItem', isc.OBDateItem);
isc.OBDateTimeItem.addClassProperties({
@@ -33,6 +33,8 @@
// * {{{dateFormat}}}: the dateFormat in OB format
// * {{{value}}}: the current entered value
autoCompleteDate: function(dateFormat, value, item){
+ var fmt;
+
// if (!isTabPressed) {
if (value === null) {
return value;
@@ -209,7 +211,7 @@
isc.OBDateTimeItem.addProperties({
blurValue: function() {
- return OBDateTimeItem.expandDateYear(this.dateFormat, this.getValue());
+ return isc.OBDateTimeItem.expandDateYear(this.dateFormat, this.getValue());
},
// ** {{{ change }}} **
@@ -221,7 +223,7 @@
return;
}
// prevent change events from happening
- var completedDate = OBDateTimeItem.autoCompleteDate(item.dateFormat,
value, this);
+ var completedDate = isc.OBDateTimeItem.autoCompleteDate(item.dateFormat,
value, this);
if (completedDate !== oldValue) {
item.setValue(completedDate);
}
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-image.js
Mon Oct 17 17:29:45 2011 +0200
@@ -37,8 +37,8 @@
command: 'GETSIZE'
};
OB.RemoteCallManager.call('org.openbravo.client.application.window.ImagesActionHandler',
{}, d, function(response, data, request){
- var pageHeight = Page.getHeight()-100;
- var pageWidth = Page.getWidth()-100;
+ var pageHeight = isc.Page.getHeight()-100;
+ var pageWidth = isc.Page.getWidth()-100;
var height;
var width;
var ratio = data.width/data.height;
@@ -181,7 +181,7 @@
// == OBImageItem ==
// Item used for Openbravo ImageBLOB images.
-isc.ClassFactory.defineClass('OBImageItem', CanvasItem);
+isc.ClassFactory.defineClass('OBImageItem', isc.CanvasItem);
isc.OBImageItem.addProperties({
shouldSaveValue: true,
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-link.js
Mon Oct 17 17:29:45 2011 +0200
@@ -19,7 +19,7 @@
//== OBLinkItem ==
//Input for normal strings (links) with an added icon to navigate to the link
-isc.ClassFactory.defineClass('OBLinkItem', TextItem);
+isc.ClassFactory.defineClass('OBLinkItem', isc.TextItem);
isc.OBLinkItem.addProperties({
validateOnExit: true,
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-linkbutton.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-linkbutton.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-linkbutton.js
Mon Oct 17 17:29:45 2011 +0200
@@ -19,4 +19,4 @@
//== OBLinkButtonItem ==
//Button to emulate a standard html link.
-isc.ClassFactory.defineClass('OBLinkButtonItem', Button);
\ No newline at end of file
+isc.ClassFactory.defineClass('OBLinkButtonItem', isc.Button);
\ No newline at end of file
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list-filter.js
Mon Oct 17 17:29:45 2011 +0200
@@ -19,7 +19,7 @@
//== OBListFilterItem ==
// Combo box for list references in filter editors.
-isc.ClassFactory.defineClass('OBListFilterItem', OBListItem);
+isc.ClassFactory.defineClass('OBListFilterItem', isc.OBListItem);
isc.OBListFilterItem.addProperties({
allowExpressions: false,
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js
Mon Oct 17 17:29:45 2011 +0200
@@ -95,7 +95,7 @@
},
setEntries: function(entries) {
- var length = entries.length,
+ var length = entries.length, i, id, identifier,
valueField = this.getValueFieldName(), valueMap = {};
this.entries = [];
for (i = 0; i < length; i++) {
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js
Mon Oct 17 17:29:45 2011 +0200
@@ -130,7 +130,7 @@
// == OBMinDateRangeItem ==
// Item used for filtering by dates in the grid. Replaces the normal
Smartclient
// MiniDateRangeItem to make it editable.
-isc.ClassFactory.defineClass('OBMiniDateRangeItem', OBTextItem);
+isc.ClassFactory.defineClass('OBMiniDateRangeItem', isc.OBTextItem);
isc.OBMiniDateRangeItem.addProperties(OB.DateItemProperties, {
validateOnExit: false,
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js
Mon Oct 17 17:29:45 2011 +0200
@@ -19,7 +19,7 @@
// = OBNumberIte =
// Contains the widgets for editing numeric values.
-isc.ClassFactory.defineClass('OBNumberItem', TextItem);
+isc.ClassFactory.defineClass('OBNumberItem', isc.TextItem);
// = OBNumberItem =
// The Openbravo numeric form item.
@@ -37,7 +37,7 @@
init: function(){
this.setKeyPressFilter(this.keyPressFilterNumeric);
- this.typeInstance = SimpleType.getType(this.type);
+ this.typeInstance = isc.SimpleType.getType(this.type);
return this.Super('init', arguments);
},
@@ -427,6 +427,8 @@
},
blur: function(){
+ var value;
+
if (this.doBlurLogic) {
this.validate();
@@ -485,10 +487,10 @@
return false;
};
-Validator.addValidator('isFloat', isc.OBNumberItem.validateCondition);
-Validator.addValidator('isInteger', isc.OBNumberItem.validateCondition);
+isc.Validator.addValidator('isFloat', isc.OBNumberItem.validateCondition);
+isc.Validator.addValidator('isInteger', isc.OBNumberItem.validateCondition);
-isc.ClassFactory.defineClass('OBNumberFilterItem', OBNumberItem);
+isc.ClassFactory.defineClass('OBNumberFilterItem', isc.OBNumberItem);
isc.OBNumberFilterItem.addProperties({
allowExpressions: true,
@@ -497,7 +499,7 @@
keyPressFilterNumeric: '[0-9.,-=<>!#orand ]',
doBlurLogic: false,
operator: 'equals',
- validOperators: ['equals', 'lessThan', 'greaterThan',
+ validOperators: ['equals', 'lessThan', 'greaterThan', 'notEqual',
'lessThan', 'lessThanOrEqual', 'greaterThanOrEqual',
'between', 'betweenInclusive', 'isNull', 'isNotNull'
],
@@ -527,11 +529,17 @@
buildValueExpressions: function(criterion) {
var i = 0, criteria, length;
- if (criterion && criterion.criteria) {
+ if (criterion && !criterion.criteria) {
+ criterion = { criteria: [criterion] };
+ }
+ if (criterion.criteria) {
criterion = isc.clone(criterion);
length = criterion.criteria.length;
for (i = 0; i < length; i++) {
criteria = criterion.criteria[i];
+ if (criteria.operator === 'iNotEqual') {
+ criteria.operator = 'notEqual';
+ }
if (criteria.start) {
criteria.start = this.convertToStringValue(criteria.start);
}
@@ -543,7 +551,7 @@
}
}
}
- var ret = this.Super('buildValueExpressions', arguments);
+ var ret = this.Super('buildValueExpressions', [criterion]);
if (isc.isA.String(ret) && ret.contains('undefined')) {
return ret.replace('undefined', '');
}
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search-attribute.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search-attribute.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search-attribute.js
Mon Oct 17 17:29:45 2011 +0200
@@ -19,7 +19,7 @@
// = Search Attribute widget =
// A specific subclass of OBSearchItem for attribute fields.
-isc.ClassFactory.defineClass('OBPAttributeSearchItem', OBSearchItem);
+isc.ClassFactory.defineClass('OBPAttributeSearchItem', isc.OBSearchItem);
isc.OBPAttributeSearchItem.addProperties({
operator: 'iContains',
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js
Mon Oct 17 17:29:45 2011 +0200
@@ -19,7 +19,7 @@
// == OBSearchItem ==
// Item used for Openbravo search fields.
-isc.ClassFactory.defineClass('OBSearchItem', StaticTextItem);
+isc.ClassFactory.defineClass('OBSearchItem', isc.StaticTextItem);
isc.ClassFactory.mixInInterface('OBSearchItem', 'OBLinkTitleItem');
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-section.js
Mon Oct 17 17:29:45 2011 +0200
@@ -20,7 +20,7 @@
// == OBSectionItem ==
// Form sections, used for notes, more information, attachment etc.
-isc.ClassFactory.defineClass('OBSectionItem', SectionItem);
+isc.ClassFactory.defineClass('OBSectionItem', isc.SectionItem);
isc.OBSectionItem.addProperties({
sectionExpanded: false,
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-spinner.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-spinner.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-spinner.js
Mon Oct 17 17:29:45 2011 +0200
@@ -20,7 +20,7 @@
// == OBSpinnerItem ==
// Input for spinner number
-isc.ClassFactory.defineClass('OBSpinnerItem', SpinnerItem);
+isc.ClassFactory.defineClass('OBSpinnerItem', isc.SpinnerItem);
isc.OBSpinnerItem.addProperties({
operator: 'equals',
diff -r f28965132f63 -r bd2a7adf0675
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js
Mon Oct 17 16:34:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js
Mon Oct 17 17:29:45 2011 +0200
@@ -20,7 +20,7 @@
// == OBTextItem ==
// Input for normal strings
-isc.ClassFactory.defineClass('OBTextItem', TextItem);
+isc.ClassFactory.defineClass('OBTextItem', isc.TextItem);
isc.OBTextItem.addProperties({
operator: 'iContains',
@@ -32,7 +32,7 @@
}
});
-isc.ClassFactory.defineClass('OBTextFilterItem', OBTextItem);
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
