diff options
| author | Fabien Meghazi <fme@openerp.com> | 2013-04-04 12:14:59 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2013-04-04 12:14:59 +0200 |
| commit | 8a20760fc895bba5297f3b7bc1df32264d45568d (patch) | |
| tree | 9f12e43172d331751e029dabe3a081b887b85d48 /addons/web/static/src | |
| parent | 47be40b07538f7df5d1d38beb6d468a5c66d4598 (diff) | |
[FIX] DataSet#size() problem + FormView#on_button_delete() shall pop breadcrumb on empty dataset
bzr revid: fme@openerp.com-20130404101459-m9q90e32qwf068lw
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/data.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index f1b043bacf9..cfcd86307ba 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -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(); diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index cdb47847b12..22f9338fad2 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -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 { |