Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] web_m2x_options check Many2one and Many2many options

pull/257/head
Antonio Espinosa 2015-11-16 13:00:04 +01:00
parent e688223a59
commit ee283f97dd
1 changed files with 67 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
web_m2x_options/static/src/js/form.js
View File

@ -99,8 +99,7 @@ openerp.web_m2x_options = function (instance) {
self.build_context())); self.build_context()));
var create_rights; var create_rights;
if (typeof this.options.create === "undefined" || if (!(self.options && (self.options.no_create || self.options.no_create_edit))) {
typeof this.options.create_edit === "undefined") {
create_rights = new instance.web.Model(this.field.relation).call( create_rights = new instance.web.Model(this.field.relation).call(
"check_access_rights", ["create", false]); "check_access_rights", ["create", false]);
} }
@ -171,10 +170,15 @@ openerp.web_m2x_options = function (instance) {
var raw_result = _(data.result).map(function (x) { var raw_result = _(data.result).map(function (x) {
return x[1]; return x[1];
}); });
var no_quick_create = (
self.options && (self.options.no_create ||
self.options.no_quick_create)
)
var m2x_create_undef = _.isUndefined(self.view.ir_options['web_m2x_options.create'])
var m2x_create = self.view.ir_options['web_m2x_options.create'] == "True"
if ((_.isUndefined(self.options.create) && _.isUndefined(self.view.ir_options['web_m2x_options.create']) && can_create) || if (!no_quick_create && ((m2x_create_undef && can_create) ||
(_.isUndefined(self.options.create) && self.view.ir_options['web_m2x_options.create'] == "True") || m2x_create)) {
self.options.create) {
if (search_val.length > 0 && if (search_val.length > 0 &&
!_.include(raw_result, search_val)) { !_.include(raw_result, search_val)) {
@ -192,10 +196,15 @@ openerp.web_m2x_options = function (instance) {
} }
// create... // create...
var no_create_edit = (
self.options && (self.options.no_create ||
self.options.no_create_edit)
)
var m2x_create_edit_undef = _.isUndefined(self.view.ir_options['web_m2x_options.create_edit'])
var m2x_create_edit = self.view.ir_options['web_m2x_options.create_edit'] == "True"
if ((_.isUndefined(self.options.create_edit) && _.isUndefined(self.view.ir_options['web_m2x_options.create_edit']) && can_create) || if (!no_create_edit && ((m2x_create_edit_undef && can_create) ||
(_.isUndefined(self.options.create) && self.view.ir_options['web_m2x_options.create_edit'] == "True") || m2x_create_edit)) {
self.options.create_edit) {
values.push({ values.push({
label: _t("Create and Edit..."), label: _t("Create and Edit..."),
@ -300,10 +309,15 @@ openerp.web_m2x_options = function (instance) {
}); });
} }
// quick create // quick create
var no_quick_create = (
self.options && (self.options.no_create ||
self.options.no_quick_create)
)
var m2x_create_undef = _.isUndefined(self.view.ir_options['web_m2x_options.create'])
var m2x_create = self.view.ir_options['web_m2x_options.create'] == "True"
if ((_.isUndefined(self.options.create) && _.isUndefined(self.view.ir_options['web_m2x_options.create'])) || if (!no_quick_create && ((m2x_create_undef && can_create) ||
(_.isUndefined(self.options.create) && self.view.ir_options['web_m2x_options.create'] == 'True') || m2x_create)) {
self.options.create) {
var raw_result = _(data.result).map(function(x) {return x[1];}); var raw_result = _(data.result).map(function(x) {return x[1];});
if (search_val.length > 0 && !_.include(raw_result, search_val)) { if (search_val.length > 0 && !_.include(raw_result, search_val)) {
@ -319,10 +333,15 @@ openerp.web_m2x_options = function (instance) {
} }
// create... // create...
var no_create_edit = (
self.options && (self.options.no_create ||
self.options.no_create_edit)
)
var m2x_create_edit_undef = _.isUndefined(self.view.ir_options['web_m2x_options.create_edit'])
var m2x_create_edit = self.view.ir_options['web_m2x_options.create_edit'] == "True"
if ((_.isUndefined(self.options.create_edit === 'undefined') && _.isUndefined(self.view.ir_options['web_m2x_options.create_edit'])) || if (!no_create_edit && ((m2x_create_edit_undef && can_create) ||
(_.isUndefined(self.options.create) && self.view.ir_options['web_m2x_options.create_edit'] == 'True') || m2x_create_edit)) {
self.options.create_edit) {
values.push({ values.push({
label: _t("Create and Edit..."), label: _t("Create and Edit..."),