From 01e70a7a8e71c78ace8e2889c761bedba5c8a915 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 7 Sep 2011 21:20:52 +0200 Subject: [FIX] Editable list gets wrong fields view get object due to previous refactoring lp bug: https://launchpad.net/bugs/843841 fixed bzr revid: fme@openerp.com-20110907192052-0bx7viwvee2r4i2d --- addons/web/static/src/js/list-editable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/list-editable.js') diff --git a/addons/web/static/src/js/list-editable.js b/addons/web/static/src/js/list-editable.js index 614c6fa42ef..ab78e5e0139 100644 --- a/addons/web/static/src/js/list-editable.js +++ b/addons/web/static/src/js/list-editable.js @@ -183,7 +183,7 @@ openerp.web.list_editable = function (openerp) { template: 'ListView.row.form', registry: openerp.web.list.form.widgets }); - $.when(self.edition_form.on_loaded({fields_view: self.get_form_fields_view()})).then(function () { + $.when(self.edition_form.on_loaded(self.get_form_fields_view())).then(function () { // put in $.when just in case FormView.on_loaded becomes asynchronous $new_row.find('td') .addClass('oe-field-cell') -- cgit v1.2.3 From 32bccb877b711fd3cf20d290db0a8390c0e676b7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 8 Sep 2011 14:55:10 +0200 Subject: [IMP] look of non-selectable or non-editable editable list views when a row is being edited dynamically add and remove padding rows lp bug: https://launchpad.net/bugs/842644 fixed bzr revid: xmo@openerp.com-20110908125510-fb7vcjsixj5sqhpz --- addons/web/static/src/js/list-editable.js | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'addons/web/static/src/js/list-editable.js') diff --git a/addons/web/static/src/js/list-editable.js b/addons/web/static/src/js/list-editable.js index ab78e5e0139..7b41b22e2f7 100644 --- a/addons/web/static/src/js/list-editable.js +++ b/addons/web/static/src/js/list-editable.js @@ -112,6 +112,7 @@ openerp.web.list_editable = function (openerp) { cancelled.resolve(); } cancelled.then(function () { + self.view.unpad_columns(); self.edition_form.stop(); self.edition_form.$element.remove(); delete self.edition_form; @@ -197,6 +198,16 @@ openerp.web.list_editable = function (openerp) { $new_row.prepend(''); } }); + // Add columns for the cancel and save buttons, if + // there are none in the list + if (!self.options.selectable) { + self.view.pad_columns( + 1, {except: $new_row, position: 'before'}); + } + if (!self.options.deletable) { + self.view.pad_columns( + 1, {except: $new_row}); + } self.edition_form.do_show(); }); -- cgit v1.2.3 From dedded529403b72bc00b373e8bdcc16da97cd73c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 12 Sep 2011 13:34:37 +0200 Subject: [FIX] a few more existing jsdoc so jsdoc v3 does not blow up during parsing bzr revid: xmo@openerp.com-20110912113437-emv28eo9ct9n559g --- addons/web/static/src/js/list-editable.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/js/list-editable.js') diff --git a/addons/web/static/src/js/list-editable.js b/addons/web/static/src/js/list-editable.js index 7b41b22e2f7..bcf6d4edac2 100644 --- a/addons/web/static/src/js/list-editable.js +++ b/addons/web/static/src/js/list-editable.js @@ -1,5 +1,6 @@ /** - * @namespace handles editability case for lists, because it depends on form and forms already depends on lists it had to be split out + * handles editability case for lists, because it depends on form and forms already depends on lists it had to be split out + * @namespace */ openerp.web.list_editable = function (openerp) { var KEY_RETURN = 13, -- cgit v1.2.3 From 650738b48d47434ea79bd2c0e40711e488ea48a7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 12 Sep 2011 14:42:57 +0200 Subject: [FIX] jsdoc: .include lends to the instances (Class#), not to the class bzr revid: xmo@openerp.com-20110912124257-74wggv2t870rchlm --- addons/web/static/src/js/list-editable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/list-editable.js') diff --git a/addons/web/static/src/js/list-editable.js b/addons/web/static/src/js/list-editable.js index bcf6d4edac2..c38c43a4c9c 100644 --- a/addons/web/static/src/js/list-editable.js +++ b/addons/web/static/src/js/list-editable.js @@ -88,7 +88,7 @@ openerp.web.list_editable = function (openerp) { } }); - openerp.web.ListView.List.include(/** @lends openerp.web.ListView.List */{ + openerp.web.ListView.List.include(/** @lends openerp.web.ListView.List# */{ row_clicked: function (event) { if (!this.options.editable) { return this._super(event); -- cgit v1.2.3