details: /erp/devel/pi/rev/98d4f747a5f7
changeset: 10980:98d4f747a5f7
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Mar 03 10:24:48 2011 +0100
summary: Removed commented lines
details: /erp/devel/pi/rev/0a3bc978ff5c
changeset: 10981:0a3bc978ff5c
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Mar 03 10:26:05 2011 +0100
summary: Solved non-working reference window, changes in the selector window
diffstat:
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java
| 6 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 36 ++++++---
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java
| 5 +-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 7 +-
4 files changed, 32 insertions(+), 22 deletions(-)
diffs (113 lines):
diff -r 3df2e9f84d9b -r 0a3bc978ff5c
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java
---
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java
Thu Mar 03 09:43:58 2011 +0100
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java
Thu Mar 03 10:26:05 2011 +0100
@@ -64,11 +64,6 @@
parameters.put(JsonConstants.USE_ALIAS, "true");
- // System.err.println(">>>>>>>>>>>>>>>>>>>>>>>>>>" + new Date());
- // for (String key : parameters.keySet()) {
- // System.err.println(key + ": " + parameters.get(key));
- // }
-
return DefaultJsonDataService.getInstance().fetch(parameters);
} finally {
OBContext.restorePreviousMode();
@@ -139,6 +134,7 @@
if (additionalPropParameter != null) {
additionalProperties.append(additionalPropParameter);
}
+
// get the additionalproperties from the properties
for (DataSourceProperty dsProp : dsProperties) {
final Map<String, Object> params =
dsProp.getUIDefinition().getDataSourceParameters();
diff -r 3df2e9f84d9b -r 0a3bc978ff5c
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 Mar 03 09:43:58 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
Thu Mar 03 10:26:05 2011 +0100
@@ -134,21 +134,29 @@
+ " has a null datasource and a null property");
}
- public static String getAdditionalProperties(Selector selector) {
+ public static String getAdditionalProperties(Selector selector, boolean
onlyDisplayField) {
+ if (onlyDisplayField
+ && (selector.getDisplayfield() == null ||
!selector.getDisplayfield().isActive())) {
+ return "";
+ }
final StringBuilder extraProperties = new StringBuilder();
- if (selector.getDisplayfield() == null ||
!selector.getDisplayfield().isActive()) {
- return extraProperties.toString();
+ for (SelectorField selectorField : selector.getOBUISELSelectorFieldList())
{
+ if (onlyDisplayField && selectorField != selector.getDisplayfield()) {
+ continue;
+ }
+ if (!selectorField.isActive()) {
+ continue;
+ }
+ String fieldName = getPropertyOrDataSourceField(selectorField);
+ final DomainType domainType = getDomainType(selectorField);
+ if (domainType instanceof ForeignKeyDomainType) {
+ fieldName = fieldName + "." + JsonConstants.IDENTIFIER;
+ }
+ if (extraProperties.length() > 0) {
+ extraProperties.append(",");
+ }
+ extraProperties.append(fieldName);
}
- SelectorField selectorField = selector.getDisplayfield();
- String fieldName = getPropertyOrDataSourceField(selectorField);
-
- // handle the case that the field is a foreign key
- // in that case always show the identifier
- final DomainType domainType = getDomainType(selectorField);
- if (domainType instanceof ForeignKeyDomainType) {
- fieldName = fieldName + "." + JsonConstants.IDENTIFIER;
- }
- extraProperties.append(fieldName);
return extraProperties.toString();
}
@@ -366,7 +374,7 @@
final Map<String, Object> dsParameters = new HashMap<String,
Object>(getParameters());
dsParameters.put(DataSourceConstants.DS_ONLY_GENERATE_CREATESTATEMENT,
true);
- final String extraProperties = getAdditionalProperties(getSelector());
+ final String extraProperties = getAdditionalProperties(getSelector(),
false);
if (extraProperties.length() > 0) {
dsParameters.put(JsonConstants.ADDITIONAL_PROPERTIES_PARAMETER,
extraProperties.toString());
}
diff -r 3df2e9f84d9b -r 0a3bc978ff5c
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java
Thu Mar 03 09:43:58 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java
Thu Mar 03 10:26:05 2011 +0100
@@ -86,11 +86,12 @@
final Map<String, Object> params = new HashMap<String, Object>();
final Reference reference = OBDal.getInstance().get(Reference.class,
getReference().getId());
for (Selector selector : reference.getOBUISELSelectorList()) {
- if (selector.isActive()) {
- final String extraProperties =
SelectorComponent.getAdditionalProperties(selector);
+ if (selector.isActive() && selector.getTable() != null) {
+ final String extraProperties =
SelectorComponent.getAdditionalProperties(selector, true);
if (extraProperties.length() > 0) {
params.put(JsonConstants.ADDITIONAL_PROPERTIES_PARAMETER,
extraProperties);
}
+ return params;
}
}
return params;
diff -r 3df2e9f84d9b -r 0a3bc978ff5c
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
Thu Mar 03 09:43:58 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
Thu Mar 03 10:26:05 2011 +0100
@@ -362,7 +362,12 @@
} else {
this.handleOutFields(record);
this.setValue(record[this.valueField]);
- this.form.setValue(this.name + '.' + this.displayField, record[this.name
+ '.' + this.displayField]);
+ this.form.setValue(this.name + '.' + this.displayField,
record[this.displayField]);
+ if (!this.valueMap) {
+ this.valueMap = {};
+ }
+ this.valueMap[record[this.valueField]] = record[this.displayField];
+ this.updateValueMap();
}
if (this.form && this.form.handleItemChange) {
this._hasChanged = true;
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
