details: /erp/devel/pi/rev/903674792a99
changeset: 11579:903674792a99
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Apr 14 15:39:00 2011 +0200
summary: Fixed issue 16801.Don't use OBSelectorFilterSelectItem if not using
SelectorItem.
diffstat:
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diffs (47 lines):
diff -r d70478229985 -r 903674792a99
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Thu Apr 14 15:27:28 2011 +0200
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Thu Apr 14 15:39:00 2011 +0200
@@ -572,6 +572,7 @@
localSelectorField.setTitle(" ");
localSelectorField.setSort(false);
localSelectorField.setFilter(false);
+ localSelectorField.setSelectorItem(isSelectorItem());
pickListFields.add(localSelectorField);
pickListFields.addAll(getSelectorFields(true, false));
return pickListFields;
@@ -610,6 +611,7 @@
localSelectorField.setName(fieldName);
localSelectorField.setTitle(getTranslatedName(selectorField));
localSelectorField.setSort(!pickList && selectorField.isSortable());
+ localSelectorField.setSelectorItem(isSelectorItem());
localSelectorField.setFilter(!pickList && selectorField.isFilterable());
localSelectorField.setDomainType(domainType);
@@ -709,6 +711,7 @@
private String displayField;
private boolean filter;
private boolean sort;
+ private boolean isSelectorItem;
private DomainType domainType;
private UIDefinition uiDefinition;
private SelectorField selectorField;
@@ -747,7 +750,7 @@
public String getFilterEditorProperties() {
if (getUIDefinition() != null) {
- if (getUIDefinition() instanceof FKComboUIDefinition) {
+ if (getUIDefinition() instanceof FKComboUIDefinition &&
isSelectorItem) {
return ", filterOperator: 'equals', filterOnKeypress: true,
canFilter:true, required: false, filterEditorType:
'OBSelectorFilterSelectItem', filterEditorProperties: {entity: '"
+ getEntityName() + "', displayField: '" +
JsonConstants.IDENTIFIER + "'}";
}
@@ -805,6 +808,10 @@
this.sort = sort;
}
+ public void setSelectorItem(boolean isSelectorItem) {
+ this.isSelectorItem = isSelectorItem;
+ }
+
public static class LocalSelectorFieldProperty {
private String name;
private String value;
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
