details: /erp/devel/pi/rev/db1c1f24c710
changeset: 10838:db1c1f24c710
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Feb 23 08:27:24 2011 +0100
summary: Related to issue 16019: Add Payment From Transaction business
partner selector does not work in maximized view
diffstat:
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector-as-link.ftl
| 2 +
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector.ftl
| 8 +++--
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
| 14 ++++++++-
3 files changed, 19 insertions(+), 5 deletions(-)
diffs (83 lines):
diff -r 86790812e399 -r db1c1f24c710
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector-as-link.ftl
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector-as-link.ftl
Tue Feb 22 22:21:18 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector-as-link.ftl
Wed Feb 23 08:27:24 2011 +0100
@@ -38,6 +38,7 @@
{<#list selectorGridField.properties as property>
${property.name}: ${property.value}<#if property_has_next>,</#if>
</#list>
+ ${selectorGridField.filterEditorProperties}
}<#if selectorGridField_has_next>,</#if>
</#list>
],
@@ -75,6 +76,7 @@
{<#list selectorGridField.properties as property>
${property.name}: ${property.value}<#if property_has_next>,</#if>
</#list>
+ ${selectorGridField.filterEditorProperties}
}<#if selectorGridField_has_next>,</#if>
</#list>
],
diff -r 86790812e399 -r db1c1f24c710
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector.ftl
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector.ftl
Tue Feb 22 22:21:18 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector.ftl
Wed Feb 23 08:27:24 2011 +0100
@@ -35,10 +35,11 @@
showSelectorGrid: ${data.showSelectorGrid},
selectorGridFields : [
<#list data.selectorGridFields as selectorGridField>
- {<#list selectorGridField.properties as property>
+ {
+ <#list selectorGridField.properties as property>
${property.name}: ${property.value}<#if property_has_next>,</#if>
- </#list>
- ${selectorGridField.filterEditorProperties}
+ </#list>
+ ${selectorGridField.filterEditorProperties}
}<#if selectorGridField_has_next>,</#if>
</#list>
],
@@ -87,6 +88,7 @@
{<#list selectorGridField.properties as property>
${property.name}: ${property.value}<#if property_has_next>,</#if>
</#list>
+ ${selectorGridField.filterEditorProperties}
}<#if selectorGridField_has_next>,</#if>
</#list>
],
diff -r 86790812e399 -r db1c1f24c710
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
---
a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
Tue Feb 22 22:21:18 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
Wed Feb 23 08:27:24 2011 +0100
@@ -394,8 +394,10 @@
// draw now already otherwise the filter does not work the
// first time
-
this.selectorWindow.show();
+ if (this.selectorGrid.filterEditor) {
+ this.selectorGrid.filterEditor.getEditForm().clearValues();
+ }
this.selectorGrid.setFilterEditorCriteria(this.defaultFilter);
this.selectorGrid.filterByEditor();
this.selectorGrid.focusInFilterEditor();
@@ -850,13 +852,21 @@
}
}
},
+
+
+ filterEditorProperties: {
+ actionButtonProperties: {
+ visibility: 'hidden'
+ }
+ },
+
fields : this.selectorGridFields,
recordDoubleClick : this.setSelectorValueFromGrid
});
OB.TestRegistry.register(baseTestRegistryName + 'selectorGrid',
this.selectorGrid);
-
+
var okButton = isc.IButton.create( {
selector : this,
title : OB.I18N.getLabel('OBUISC_Dialog.OK_BUTTON_TITLE'),
------------------------------------------------------------------------------
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
