details: https://code.openbravo.com/erp/devel/pi/rev/14aebcd32052
changeset: 15931:14aebcd32052
user: Guillermo Álvarez de Eulate <guillermo.alvarez <at> openbravo.com>
date: Wed Mar 28 13:21:37 2012 +0200
summary: Fixed issue 17537: records of undeleatable tables cant be deleted
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
| 2 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 4 ++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
| 5 ++++-
4 files changed, 10 insertions(+), 3 deletions(-)
diffs (53 lines):
diff -r f022f458e555 -r 14aebcd32052
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Wed Mar 28 13:25:08 2012 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-tab.js.ftl
Wed Mar 28 13:21:37 2012 +0200
@@ -25,7 +25,7 @@
tabTitle: '${tabComponent.tabTitle?js_string}',
entity: '${tabComponent.entityName}',
-
+ isDeleteableTable: ${tabComponent.deleteableTable?string},
<#if tabComponent.parentProperty != ''>
parentProperty: '${tabComponent.parentProperty?js_string}',
</#if>
diff -r f022f458e555 -r 14aebcd32052
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Wed Mar 28 13:25:08 2012 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Wed Mar 28 13:21:37 2012 +0200
@@ -243,6 +243,10 @@
return parentProperty;
}
+ public boolean getDeleteableTable() {
+ return tab.getTable().isDeletableRecords();
+ }
+
public String getViewForm() {
// force a load all the columns of the table
getTab().getTable().getADColumnList().size();
diff -r f022f458e555 -r 14aebcd32052
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Wed Mar 28 13:25:08 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
Wed Mar 28 13:21:37 2012 +0200
@@ -1417,7 +1417,7 @@
}
});
}
- if (recordsSelected && !this.view.readOnly && !this.view.singleRecord &&
this.allSelectedRecordsWritable()) {
+ if (this.view.isDeleteableTable && recordsSelected && !this.view.readOnly
&& !this.view.singleRecord && this.allSelectedRecordsWritable()) {
menuItems.add({
title: OB.I18N.getLabel('OBUIAPP_Delete'),
keyTitle: OB.KeyboardManager.Shortcuts.getProperty('keyComb.text',
'ToolBar_Eliminate', 'id'),
diff -r f022f458e555 -r 14aebcd32052
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Wed Mar 28 13:25:08 2012 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js
Wed Mar 28 13:21:37 2012 +0200
@@ -155,7 +155,10 @@
selectedRecords = grid.getSelectedRecords(),
length = selectedRecords.length,
i;
-
+ if (!this.view.isDeleteableTable) {
+ this.setDisabled(true);
+ return;
+ }
for (i = 0; i < length; i++) {
if (!grid.isWritable(selectedRecords[i])) {
this.setDisabled(true);
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
