details: /erp/devel/pi/rev/92ecb7ac760a
changeset: 11161:92ecb7ac760a
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Mar 09 13:56:45 2011 -0600
summary: Removed cancel edit confirmation
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 15 +--
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 43 ++++-----
2 files changed, 24 insertions(+), 34 deletions(-)
diffs (78 lines):
diff -r 5e97adac7909 -r 92ecb7ac760a
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
Wed Mar 09 13:47:34 2011 -0600
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Wed Mar 09 13:56:45 2011 -0600
@@ -1411,16 +1411,11 @@
// selected records
grid = view.viewGrid;
}
- callback = function(ok){
- if (ok) {
- if (form) {
- form.undo();
- } else {
- grid.undoEditSelectedRows();
- }
- }
- };
- isc.ask(OB.I18N.getLabel('OBUIAPP_ConfirmUndo', callback), callback);
+ if (form) {
+ form.undo();
+ } else {
+ grid.undoEditSelectedRows();
+ }
},
// ++++++++++++++++++++ Parent-Child Tab Handling ++++++++++++++++++++++++++
diff -r 5e97adac7909 -r 92ecb7ac760a
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
Wed Mar 09 13:47:34 2011 -0600
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Wed Mar 09 13:56:45 2011 -0600
@@ -1370,30 +1370,25 @@
if (!preventConfirm &&
(this.getEditForm().hasChanged || this.rowHasErrors(rowNum))) {
- isc.ask(OB.I18N.getLabel('OBUIAPP_ConfirmCancelEdit'), function(value){
- if (value) {
-
- me.Super('discardEdits', localArguments);
-
- // remove the record if new
- if (record._new) {
- me.data.handleUpdate('remove', [{
- id: record.id
- }]);
- me.updateRowCountDisplay();
- me.view.refreshChildViews();
- } else {
- // remove the error style/msg
- me.setRecordErrorMessage(rowNum, null);
- }
-
- me.view.standardWindow.cleanUpAutoSaveProperties();
-
- // update after removing the error msg
- me.view.updateTabTitle();
- me.view.toolBar.updateButtonState(true);
- }
- });
+ me.Super('discardEdits', localArguments);
+
+ // remove the record if new
+ if (record._new) {
+ me.data.handleUpdate('remove', [{
+ id: record.id
+ }]);
+ me.updateRowCountDisplay();
+ me.view.refreshChildViews();
+ } else {
+ // remove the error style/msg
+ me.setRecordErrorMessage(rowNum, null);
+ }
+
+ me.view.standardWindow.cleanUpAutoSaveProperties();
+
+ // update after removing the error msg
+ me.view.updateTabTitle();
+ me.view.toolBar.updateButtonState(true);
} else {
me.Super('discardEdits', localArguments);
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
