odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] DataSet#size() problem + FormView#on_button_delete() shall pop breadcrumb on empty dataset 

bzr revid: fme@openerp.com-20130404101459-m9q90e32qwf068lw
This commit is contained in:
Fabien Meghazi 2013-04-04 12:14:59 +02:00
parent 47be40b075
commit 8a20760fc8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/js/data.js
View File

@ -716,7 +716,7 @@ instance.web.DataSetSearch = instance.web.DataSet.extend({
});
},
size: function () {
if (this._length !== undefined) {
if (this._length != null) {
return this._length;
}
return this._super();

6
addons/web/static/src/js/view_form.js
View File

@ -765,7 +765,11 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
this.has_been_loaded.done(function() {
if (self.datarecord.id && confirm(_t("Do you really want to delete this record?"))) {
self.dataset.unlink([self.datarecord.id]).done(function() {
self.execute_pager_action('next');
if (self.dataset.size()) {
self.execute_pager_action('next');
} else {
self.do_action('history_back');
}
def.resolve();
});
} else {