tryton-do/tryton
2
0 Fork 0
Code Issues Pull Requests 2 Actions 2 Packages Projects Releases Wiki Activity

Fix WizardDialog.destroy

Browse Source 
- Fix typo in event name.
- Wait until the wizard dialog is closed to read the correct wizard object.

issue5704
review28521002
This commit is contained in:
Sergi Almacellas Abellana committed 2016-07-15 14:53:36 +02:00
1 parent 406351b8c1
commit 9e1042dabf
1 file changed
+33 -33
Download Patch File Download Diff File Expand all files Collapse all files
src/wizard.js
+33 -33
View File
@@ -242,45 +242,45 @@
},
destroy: function(action) {
Sao.Wizard.Dialog._super.destroy.call(this);
this.dialog.on('hidden.bsd.modal', function(event) {
jQuery(this).remove();
});
this.dialog.modal('hide');
var dialog = jQuery('.wizard-dialog').filter(':visible')[0];
var is_menu = false;
var screen;
if (!dialog) {
dialog = Sao.Tab.tabs.get_current();
if (dialog) {
if (dialog.screen &&
dialog.screen.model_name != this.model) {
this.dialog.on('hidden.bs.modal', function(event) {
this.dialog.remove();
var dialog = jQuery('.wizard-dialog').filter(':visible')[0];
var is_menu = false;
var screen;
if (!dialog) {
dialog = Sao.Tab.tabs.get_current();
if (dialog) {
if (dialog.screen &&
dialog.screen.model_name != this.model) {
is_menu = true;
screen = Sao.main_menu_screen;
}
} else {
is_menu = true;
screen = Sao.main_menu_screen;
}
} else {
is_menu = true;
screen = Sao.main_menu_screen;
}
}
if (dialog && dialog.screen) {
screen = dialog.screen;
}
if (screen) {
if (screen.current_record && !is_menu) {
var ids;
if (screen.model_name == this.model) {
ids = this.ids;
} else {
// Wizard run form a children record so reload parent
// record
ids = [screen.current_record.id];
if (dialog && dialog.screen) {
screen = dialog.screen;
}
if (screen) {
if (screen.current_record && !is_menu) {
var ids;
if (screen.model_name == this.model) {
ids = this.ids;
} else {
// Wizard run form a children record so reload
// parent record
ids = [screen.current_record.id];
}
screen.reload(ids, true);
}
if (action) {
screen.client_action(action);
}
screen.reload(ids, true);
}
if (action) {
screen.client_action(action);
}
}
}.bind(this));
this.dialog.modal('hide');
},
end: function() {
return Sao.Wizard.Dialog._super.end.call(this).then(