details: https://code.openbravo.com/erp/devel/pi/rev/5f12172fde79 changeset: 13828:5f12172fde79 user: Martin Taal <martin.taal <at> openbravo.com> date: Sun Sep 25 11:18:37 2011 +0200 summary: Fixes issue 18598: shown in search field Overriden mapValueToDisplay method to prevent display of nbsp;
details: https://code.openbravo.com/erp/devel/pi/rev/ae3d74392c5e changeset: 13829:ae3d74392c5e user: Martin Taal <martin.taal <at> openbravo.com> date: Sun Sep 25 11:19:47 2011 +0200 summary: Fixes issue 18591: DB Id shown in selector popup Set value again after datasource has been set Don't overwrite filterEditorType if it is set on field level diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js | 8 ---- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js | 18 +--------- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 4 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js | 12 ++++++ modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 2 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 17 +++++++++ 6 files changed, 34 insertions(+), 27 deletions(-) diffs (123 lines): diff -r d429a6d5167f -r ae3d74392c5e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js Sat Sep 24 07:39:13 2011 -0400 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js Sun Sep 25 11:19:47 2011 +0200 @@ -26,14 +26,6 @@ allowExpressions: true, validateOnExit: false, validateOnChange: false, - - init: function() { - - if (this.displayField && !this.criteriaField) { - this.criteriaField = this.displayField; - } - this.Super('init', arguments); - }, // solve a small bug in the value expressions buildValueExpressions: function() { diff -r d429a6d5167f -r ae3d74392c5e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js Sat Sep 24 07:39:13 2011 -0400 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js Sun Sep 25 11:19:47 2011 +0200 @@ -45,23 +45,7 @@ isc.OBPopUpTextAreaItem.addProperties({ validateOnExit: true, canFocus: true, - popUpOnEnter: true, - - // workaround for this: - // http://forums.smartclient.com/showthread.php?p=73173 - mapValueToDisplay : function (internalValue, a,b,c,d) { - var value = this.invokeSuper(isc.StaticTextItem, "mapValueToDisplay", - internalValue, a,b,c,d); - var asHTML = this.escapeHTML || this.outputAsHTML || this.asHTML; - - // Don't escape unless that's actually the data value! - if (asHTML && (internalValue === null || internalValue === isc.emptyString) - && value === ' ') { - return value; - } - return this.Super('mapValueToDisplay', arguments); - } - + popUpOnEnter: true }); // hack until this gets answered: diff -r d429a6d5167f -r ae3d74392c5e modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Sat Sep 24 07:39:13 2011 -0400 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Sun Sep 25 11:19:47 2011 +0200 @@ -1966,9 +1966,11 @@ if (type.editorType) { fld.editorType = type.editorType; } - if (type.filterEditorType) { + + if (type.filterEditorType && !fld.filterEditorType) { fld.filterEditorType = type.filterEditorType; } + // don't set it if explicitly set to null if (fld.fkField) { fld.displayField = fld.name + '.' + OB.Constants.IDENTIFIER; diff -r d429a6d5167f -r ae3d74392c5e modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js --- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js Sat Sep 24 07:39:13 2011 -0400 +++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js Sun Sep 25 11:19:47 2011 +0200 @@ -36,6 +36,18 @@ return ret; }, + setDataSource: function(ds) { + var val; + this.optionDataSource = ds; + if (this.getValue()) { + val = this.getValue(); + // first clear + this.setValue(null); + // then set again to force a load + this.setValue(val); + } + }, + filterDataBoundPickList : function (requestProperties, dropCache){ requestProperties = requestProperties || {}; requestProperties.params = requestProperties.params || {}; diff -r d429a6d5167f -r ae3d74392c5e modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js --- a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js Sat Sep 24 07:39:13 2011 -0400 +++ b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js Sun Sep 25 11:19:47 2011 +0200 @@ -175,7 +175,7 @@ type = isc.SimpleType.getType(gridField.type); - if (type.filterEditorType) { + if (type.filterEditorType && !gridField.filterEditorType) { gridField.filterEditorType = type.filterEditorType; } diff -r d429a6d5167f -r ae3d74392c5e modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js --- a/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js Sat Sep 24 07:39:13 2011 -0400 +++ b/modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js Sun Sep 25 11:19:47 2011 +0200 @@ -66,6 +66,23 @@ isc.StaticTextItem.getPrototype().getCanFocus = function() {return false;}; +isc.StaticTextItem.addProperties({ + // workaround for this: + // http://forums.smartclient.com/showthread.php?p=73173 + mapValueToDisplay : function (internalValue, a,b,c,d) { + var value = this.invokeSuper(isc.StaticTextItem, "mapValueToDisplay", + internalValue, a,b,c,d); + var asHTML = this.escapeHTML || this.outputAsHTML || this.asHTML; + + // Don't escape unless that's actually the data value! + if (asHTML && (internalValue === null || internalValue === isc.emptyString) + && value === ' ') { + return value; + } + return this.Super('mapValueToDisplay', arguments); + } +}); + isc.Layout.addProperties({ destroyAndRemoveMembers: function(toDestroy) { ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2dcopy2 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
