details: /erp/devel/pi/rev/58ba45ebdd36
changeset: 11062:58ba45ebdd36
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Mon Mar 07 16:24:34 2011 +0100
summary: Small fix: removed extra ampersand
details: /erp/devel/pi/rev/6928870ca269
changeset: 11063:6928870ca269
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Mon Mar 07 19:58:18 2011 +0100
summary: [OBUISEL] Fixes FK filter editor
diffstat:
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 4 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
| 26 ----------
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js
| 15 ++---
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 4 +-
src/index.jsp
| 2 +-
5 files changed, 11 insertions(+), 40 deletions(-)
diffs (135 lines):
diff -r e784f03d57b2 -r 6928870ca269
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
Mon Mar 07 17:59:38 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Mon Mar 07 19:58:18 2011 +0100
@@ -749,8 +749,8 @@
public String getFilterEditorProperties() {
if (getUIDefinition() != null) {
if (getUIDefinition() instanceof FKComboUIDefinition) {
- return ", canFilter:true, required: false, filterEditorType:
'OBSelectorFilterSelectItem', filterEditorProperties: {entity: '"
- + getEntityName() + "'}";
+ return ", filterOnKeypress: true, canFilter:true, required: false,
filterEditorType: 'OBSelectorFilterSelectItem', filterEditorProperties:
{entity: '"
+ + getEntityName() + "', displayField: '_identifier'}";
}
return getUIDefinition().getFilterEditorProperties(null);
}
diff -r e784f03d57b2 -r 6928870ca269
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
Mon Mar 07 17:59:38 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
Mon Mar 07 19:58:18 2011 +0100
@@ -19,7 +19,6 @@
package org.openbravo.userinterface.selector;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
@@ -35,8 +34,6 @@
import org.openbravo.base.model.Property;
import org.openbravo.base.model.Reference;
import org.openbravo.base.model.domaintype.DomainType;
-import org.openbravo.base.model.domaintype.ForeignKeyDomainType;
-import org.openbravo.base.structure.BaseOBObject;
import org.openbravo.base.util.Check;
import org.openbravo.client.application.OBBindings;
import org.openbravo.client.kernel.BaseActionHandler;
@@ -45,8 +42,6 @@
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
-import org.openbravo.service.json.JsonConstants;
-import org.openbravo.service.json.JsonUtils;
/**
*
@@ -93,28 +88,7 @@
if (sel.isCustomQuery()) {
result.put(f.getDisplayColumnAlias(), exprResult);
} else {
- final DomainType domainType = getDomainType(f);
String fieldName = f.getProperty();
- if (domainType instanceof ForeignKeyDomainType) {
- final String entityName =
f.getObuiselSelector().getTable().getName();
- final Entity entity =
ModelProvider.getInstance().getEntity(entityName);
- final List<Property> properties =
JsonUtils.getPropertiesOnPath(entity, f
- .getProperty());
- if (!properties.isEmpty()) {
- final Property property = properties.get(properties.size() -
1);
-
- @SuppressWarnings("unchecked")
- Class<? extends BaseOBObject> o = (Class<? extends
BaseOBObject>) Class
-
.forName(property.getReferencedProperty().getEntity().getClassName());
- String identifier = OBDal.getInstance().get(o,
exprResult).getIdentifier();
- if (identifier != null) {
- exprResult = identifier;
- }
- }
-
- fieldName = fieldName + "." + JsonConstants.IDENTIFIER;
- }
-
result.put(fieldName, exprResult);
}
} catch (Exception e) {
diff -r e784f03d57b2 -r 6928870ca269
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
Mon Mar 07 17:59:38 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-filter-select-item.js
Mon Mar 07 19:58:18 2011 +0100
@@ -19,10 +19,13 @@
isc.ClassFactory.defineClass('OBSelectorFilterSelectItem', SelectItem);
isc.OBSelectorFilterSelectItem.addProperties({
+ filterOnKeypress: true,
+
+ valueField: OB.Constants.ID,
+ displayField: OB.Constants.IDENTIFIER,
+
pickListFields: [{
- name: OB.Constants.IDENTIFIER,
- displayField: OB.Constants.IDENTIFIER,
- valueField: OB.Constants.ID
+ name: OB.Constants.IDENTIFIER
}],
init: function() {
@@ -32,11 +35,5 @@
setDataSource: function(ds) {
this.optionDataSource = ds;
- },
-
- change: function(form, item, value, oldValue) {
- var criteria = {};
- criteria[this.displayField] = value;
- this.selectorWindow.selectorGrid.filterData(criteria);
}
});
diff -r e784f03d57b2 -r 6928870ca269
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
Mon Mar 07 17:59:38 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
Mon Mar 07 19:58:18 2011 +0100
@@ -197,13 +197,13 @@
closeClick: function() {
this.hide(arguments);
- },
+ },
hide: function(){
this.Super('hide', arguments);
this.selector.focusInItem();
},
-
+
show: function(){
// draw now already otherwise the filter does not work the
// first time
diff -r e784f03d57b2 -r 6928870ca269 src/index.jsp
--- a/src/index.jsp Mon Mar 07 17:59:38 2011 +0100
+++ b/src/index.jsp Mon Mar 07 19:58:18 2011 +0100
@@ -57,7 +57,7 @@
<meta name="keywords" content="openbravo">
<meta name="description" content="Openbravo S.L.U.">
<link rel="shortcut icon" href="./web/images/favicon.ico" />
-<link rel="stylesheet" type="text/css"
href="./org.openbravo.client.kernel/OBCLKER_Kernel/StyleSheetResources?_mode=3.00&&_skinVersion=3.00"/>
+<link rel="stylesheet" type="text/css"
href="./org.openbravo.client.kernel/OBCLKER_Kernel/StyleSheetResources?_mode=3.00&_skinVersion=3.00"/>
<title>Openbravo</title>
<script type="text/javascript"
src="./web/org.openbravo.client.kernel/js/LAB.min.js"></script>
<!-- styles used during loading -->
------------------------------------------------------------------------------
What You Don't Know About Data Connectivity CAN Hurt You
This paper provides an overview of data connectivity, details
its effect on application quality, and explores various alternative
solutions. http://p.sf.net/sfu/progress-d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
