details: /erp/devel/pi/rev/5529fa00a7de
changeset: 12035:5529fa00a7de
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri May 06 15:04:02 2011 +0200
summary: Fixes issue 17027: After enabling or disabling Heartbeat, the action
button goes hidden
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diffs (48 lines):
diff -r ebead384d08c -r 5529fa00a7de
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Fri May 06 14:21:52 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Fri May 06 15:04:02 2011 +0200
@@ -985,6 +985,7 @@
// bypass the autosave logic
this.standardWindow.setActiveView(this);
this.viewGrid.isOpenDirectMode = true;
+ this.viewGrid.isOpenDirectModeLeaf = true;
}
if (this.parentView) {
diff -r ebead384d08c -r 5529fa00a7de
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Fri May 06 14:21:52 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Fri May 06 15:04:02 2011 +0200
@@ -538,7 +538,7 @@
}
// no data and the grid is not visible
- if (endRow === 0 && !this.isVisible()) {
+ if (this.data && this.data.getLength() === 0 && !this.isVisible()) {
this.makeVisible();
}
@@ -615,6 +615,11 @@
}
this.actionAfterDataArrived = callback;
this.invalidateCache();
+
+ var context = {
+ showPrompt: false
+ };
+ this.filterData(this.getCriteria(), null, context);
},
// with a delay to handle the target record when the body has been drawn
@@ -645,10 +650,11 @@
this.scrollCellIntoView(recordIndex, null, true, true);
// show the form with the selected record
- if (!this.view.isShowingForm && !this.isOpenDirectModeParent) {
+ if (!this.view.isShowingForm && this.isOpenDirectModeLeaf) {
this.view.editRecord(gridRecord);
}
+ delete this.isOpenDirectModeLeaf;
delete this.isOpenDirectModeParent;
} else {
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
