From 383f1750c53cae05210b143ba2457ea541d579d6 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 21 Feb 2012 10:58:56 +0100 Subject: [imp] wip bzr revid: nicolas.vanhoren@openerp.com-20120221095856-656l1so4ejc06gih --- addons/web/static/src/js/view_list_editable.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'addons/web/static/src/js/view_list_editable.js') diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index c7222455889..de19fcdc3cd 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -202,7 +202,7 @@ openerp.web.list_editable = function (openerp) { var $new_row = $('', { id: _.uniqueId('oe-editable-row-'), 'data-id': record_id, - 'class': row ? $(row).attr('class') : '' + ' oe_forms', + 'class': row ? $(row).attr('class') : '' + ' oe_forms oe_form_header', click: function (e) {e.stopPropagation();} }) .delegate('button.oe-edit-row-save', 'click', function () { @@ -235,13 +235,10 @@ openerp.web.list_editable = function (openerp) { } self.edition = true; self.edition_id = record_id; - self.edition_form = _.extend(new openerp.web.ListEditableFormView(self.view, self.dataset, false), { - form_template: 'ListView.row.form', - registry: openerp.web.list.form.widgets, - $element: $new_row - }); - // HA HA - self.edition_form.appendTo(); + self.edition_form = new openerp.web.ListEditableFormView(self.view, self.dataset, false); + self.edition_form.$element = $new_row; + // HO HO + // empty $.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') @@ -383,7 +380,7 @@ openerp.web.list_editable = function (openerp) { openerp.web.list.form = {}; } openerp.web.list.form.WidgetFrame = openerp.web.form.WidgetFrame.extend({ - template: 'ListView.row.frame' + form_template: 'ListView.row.frame' }); var form_widgets = openerp.web.form.widgets; openerp.web.list.form.widgets = form_widgets.extend({ @@ -418,9 +415,10 @@ openerp.web.list_editable = function (openerp) { }); openerp.web.ListEditableFormView = openerp.web.FormView.extend({ - init_view: function() {}, - _render_and_insert: function () { - return this.start(); - } + form_template: 'ListView.row.form', + init: function() { + this._super.apply(this, arguments); + this.registry = openerp.web.list.form.widgets; + }, }); }; -- cgit v1.2.3 From 4f09c66c3b1b7858faf45c04e782210a536c0073 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 21 Feb 2012 11:15:22 +0100 Subject: [imp] removed useless class bzr revid: nicolas.vanhoren@openerp.com-20120221101522-c9hkpg381cz6j5l4 --- addons/web/static/src/js/view_list_editable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/view_list_editable.js') diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index de19fcdc3cd..6942f720863 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -202,7 +202,7 @@ openerp.web.list_editable = function (openerp) { var $new_row = $('', { id: _.uniqueId('oe-editable-row-'), 'data-id': record_id, - 'class': row ? $(row).attr('class') : '' + ' oe_forms oe_form_header', + 'class': row ? $(row).attr('class') : '' + ' oe_forms', click: function (e) {e.stopPropagation();} }) .delegate('button.oe-edit-row-save', 'click', function () { -- cgit v1.2.3 From efb48237bb23fc646ffb48db511ba2f36b10071f Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 21 Feb 2012 11:52:29 +0100 Subject: [imp] improved html generation in editable lists bzr revid: nicolas.vanhoren@openerp.com-20120221105229-h7609f8boalmvl6q --- addons/web/static/src/js/view_list_editable.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'addons/web/static/src/js/view_list_editable.js') diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index 6942f720863..55f710d69ab 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -237,21 +237,14 @@ openerp.web.list_editable = function (openerp) { self.edition_id = record_id; self.edition_form = new openerp.web.ListEditableFormView(self.view, self.dataset, false); self.edition_form.$element = $new_row; + self.edition_form.editable_list = self; // HO HO // empty $.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') - .removeAttr('width') .end() .find('td:last').removeClass('oe-field-cell').end(); - if (self.options.selectable) { - $new_row.prepend(''); - } - if (self.options.isClarkGable) { - $new_row.prepend(''); - } // pad in case of groupby _(self.columns).each(function (column) { if (column.meta) { -- cgit v1.2.3 From 75d39c7f6a2565419c28bac4397678a6d60c5544 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 21 Feb 2012 17:29:12 +0100 Subject: [imp] renammed stop() bzr revid: nicolas.vanhoren@openerp.com-20120221162912-zheko30qoh84hcoq --- addons/web/static/src/js/view_list_editable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/view_list_editable.js') diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index 55f710d69ab..b8699bcc006 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -139,7 +139,7 @@ openerp.web.list_editable = function (openerp) { } cancelled.then(function () { self.view.unpad_columns(); - self.edition_form.stop(); + self.edition_form.destroy(); self.edition_form.$element.remove(); delete self.edition_form; delete self.edition_id; -- cgit v1.2.3