summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorDenis Ledoux dle@openerp.com <>2012-11-20 17:16:34 +0100
committerDenis Ledoux dle@openerp.com <>2012-11-20 17:16:34 +0100
commitbdca6b0925b7c9836842b2802efe8659bc23a88d (patch)
tree78ea413f7ffe13bd1ef09013302739e4b2efdb36 /addons/web/static/src/js
parent3edac3494914802810c785e0fd6ab67a4be9cf4c (diff)
parent08e0522ad67b130c6ae6008fd70a0ca902590976 (diff)
[FIX]Fix bug lp:1080997. Add option 'disable_editable_mode' which disable editable widget when setted to true. This is because search popups should not be editable. 'search more...' was not clickable in fields with many2many_tags widget and default tree view with flag editable setted
bzr revid: dle@openerp.com-20121120161634-xc0qxyz6x1ccrl2o
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/view_form.js1
-rw-r--r--addons/web/static/src/js/view_list.js2
-rw-r--r--addons/web/static/src/js/view_list_editable.js5
3 files changed, 6 insertions, 2 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 81987dc9e15..d7b3a6805d9 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4628,6 +4628,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend
'selectable': !self.options.disable_multiple_selection,
'import_enabled': false,
'$buttons': self.$buttonpane,
+ 'disable_editable_mode': true,
}, self.options.list_view_options || {}));
self.view_list.on('edit:before', self, function (e) {
e.cancel = true;
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index df74674a343..55e3c17b494 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -21,6 +21,8 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
// whether the view rows can be reordered (via vertical drag & drop)
'reorderable': true,
'action_buttons': true,
+ //whether the editable property of the view has to be disabled
+ 'disable_editable_mode': false,
},
view_type: 'tree',
/**
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index ec0bf2774fe..db7e22e5f32 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -88,9 +88,10 @@ openerp.web.list_editable = function (instance) {
});
},
editable: function () {
- return this.fields_view.arch.attrs.editable
+ return !this.options.disable_editable_mode
+ && (this.fields_view.arch.attrs.editable
|| this._context_editable
- || this.options.editable;
+ || this.options.editable);
},
/**
* Replace do_search to handle editability process