From 12f01f09a12548e7f984449d46206864eebed409 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Fri, 24 Aug 2012 11:04:59 +0530 Subject: [PATCH] [IMP] 1] if create='false' no extra row in a editable embeded list. 2] If edit='false' o2mfrom pop should be on readony mode bzr revid: jam@tinyerp.com-20120824053459-91ejrex8ox4hfptz --- addons/web/static/src/js/view_form.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 97e4b976c04..e91d343a618 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3461,7 +3461,8 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ } }, do_activate_record: function(index, id) { - var self = this; + var self = this, + attr_readonly = (_.has(this.fields_view.arch.attrs, 'edit'))?JSON.parse(this.fields_view.arch.attrs.edit):true; var pop = new instance.web.form.FormOpenPopup(self.o2m.view); pop.show_element(self.o2m.field.relation, id, self.o2m.build_context(), { title: _t("Open: ") + self.o2m.string, @@ -3477,7 +3478,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ return self.o2m.dataset.read_ids.apply(self.o2m.dataset, arguments); }, form_view_options: {'not_interactible_on_create':true}, - readonly: self.o2m.get("effective_readonly") + readonly: attr_readonly ? self.o2m.get("effective_readonly") : true, }); }, do_button_action: function (name, id, callback) { @@ -3565,7 +3566,11 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ }); instance.web.form.One2ManyList = instance.web.ListView.List.extend({ pad_table_to: function (count) { - this._super(count > 0 ? count - 1 : 0); + count = count > 0 ? count - 1 : 0 + if (! this.view._is_action_enabled('create')){ + count = this.records.length + } + this._super(count); // magical invocation of wtf does that do if (this.view.o2m.get('effective_readonly')) {