Skip to content

[18.0][FIX] web_m2x_options: allow field-level overrides of the global create and create_edit options #3400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ricardoalso wants to merge 1 commit into
base: 18.0
Choose a base branch
from
+35 −22
Open

[18.0][FIX] web_m2x_options: allow field-level overrides of the global create and create_edit options #3400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 35 additions & 22 deletions web_m2x_options/static/src/components/form.esm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,41 +27,51 @@ function evaluateSystemParameterDefaultTrue(option) {
return isOptionSet ? evaluateBooleanExpr(isOptionSet) : true;
}

function evaluateHasCreatePermission(attrs) {
return attrs.can_create ? evaluateBooleanExpr(attrs.can_create) : true;
}

function evaluateFieldBooleanOption(option) {
return typeof option === "boolean" ? option : evaluateBooleanExpr(option);
}

patch(many2OneField, {
m2o_options_props_create(props, attrs, options) {
const canQuickCreate = evaluateSystemParameterDefaultTrue("create");
const hasCreatePermission = evaluateHasCreatePermission(attrs);
if (options.no_quick_create) {
props.canQuickCreate = false;
} else if ("no_quick_create" in options) {
props.canQuickCreate = attrs.can_create
? evaluateBooleanExpr(attrs.can_create)
: true;
props.canQuickCreate = hasCreatePermission;
} else if ("create" in options) {
// Field option set, but must respect can_create security attribute
props.canQuickCreate =
hasCreatePermission && evaluateFieldBooleanOption(options.create);
} else if (!canQuickCreate && props.canQuickCreate) {
props.canQuickCreate = false;
} else if (canQuickCreate && !props.canQuickCreate) {
props.canQuickCreate = attrs.can_create
? evaluateBooleanExpr(attrs.can_create)
: true;
props.canQuickCreate = hasCreatePermission;
}
return props;
},

m2o_options_props_create_edit(props, attrs, options) {
const canCreateEdit = evaluateSystemParameterDefaultTrue("create_edit");
const hasCreatePermission = evaluateHasCreatePermission(attrs);
if (options.no_create_edit) {
props.canCreateEdit = false;
} else if ("no_create_edit" in options) {
// Same condition set in web/views/fields/many2one/many2one_field
props.canCreateEdit = attrs.can_create
? evaluateBooleanExpr(attrs.can_create)
: true;
props.canCreateEdit = hasCreatePermission;
} else if ("create_edit" in options) {
// Field option set, but must respect can_create security attribute
props.canCreateEdit =
hasCreatePermission && evaluateFieldBooleanOption(options.create_edit);
} else if (!canCreateEdit && props.canCreateEdit) {
props.canCreateEdit = false;
} else if (canCreateEdit && !props.canCreateEdit) {
// Same condition set in web/views/fields/many2one/many2one_field
props.canCreateEdit = attrs.can_create
? evaluateBooleanExpr(attrs.can_create)
: true;
props.canCreateEdit = hasCreatePermission;
}
return props;
},
Expand Down Expand Up @@ -152,35 +162,38 @@ patch(Many2OneField.prototype, {
patch(many2ManyTagsField, {
m2m_options_props_create(props, attrs, options) {
const canQuickCreate = evaluateSystemParameterDefaultTrue("create");
const hasCreatePermission = evaluateHasCreatePermission(attrs);
// Create option already available for m2m fields
if (!options.no_quick_create) {
if (!canQuickCreate && props.canQuickCreate) {
if ("create" in options) {
// Field option set, but must respect can_create security attribute
props.canQuickCreate =
hasCreatePermission && evaluateFieldBooleanOption(options.create);
} else if (!canQuickCreate && props.canQuickCreate) {
props.canQuickCreate = false;
} else if (canQuickCreate && !props.canQuickCreate) {
props.canQuickCreate = attrs.can_create
? evaluateBooleanExpr(attrs.can_create)
: true;
props.canQuickCreate = hasCreatePermission;
}
}
return props;
},

m2m_options_props_create_edit(props, attrs, options) {
const canCreateEdit = evaluateSystemParameterDefaultTrue("create_edit");
const hasCreatePermission = evaluateHasCreatePermission(attrs);
if (options.no_create_edit) {
props.canCreateEdit = false;
} else if ("no_create_edit" in options) {
// Same condition set in web/views/fields/many2one/many2one_field
props.canCreateEdit = attrs.can_create
? evaluateBooleanExpr(attrs.can_create)
: true;
props.canCreateEdit = hasCreatePermission;
} else if ("create_edit" in options) {
props.canCreateEdit =
hasCreatePermission && evaluateFieldBooleanOption(options.create_edit);
} else if (!canCreateEdit && props.canCreateEdit) {
props.canCreateEdit = false;
} else if (canCreateEdit && !props.canCreateEdit) {
// Same condition set in web/views/fields/many2one/many2one_field
props.canCreateEdit = attrs.can_create
? evaluateBooleanExpr(attrs.can_create)
: true;
props.canCreateEdit = hasCreatePermission;
}
return props;
},
Expand Down