Skip to content

Commit

Permalink
Merge PR #2959 into 17.0
Browse files Browse the repository at this point in the history
Signed-off-by pedrobaeza
  • Loading branch information
OCA-git-bot committed Oct 16, 2024
2 parents ede5920 + bb4b8a2 commit 777ea72
Showing 1 changed file with 21 additions and 15 deletions.
36 changes: 21 additions & 15 deletions web_m2x_options/static/src/components/form.esm.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,57 +10,63 @@ import {
KanbanMany2OneAvatarField,
Many2OneAvatarField,
} from "@web/views/fields/many2one_avatar/many2one_avatar_field";
import {Many2ManyTagsAvatarField} from "@web/views/fields/many2many_tags_avatar/many2many_tags_avatar_field";
import {
KanbanMany2ManyTagsAvatarField,
Many2ManyTagsAvatarField,
} from "@web/views/fields/many2many_tags_avatar/many2many_tags_avatar_field";

import {Many2XAutocomplete} from "@web/views/fields/relational_utils";
import {evaluateBooleanExpr} from "@web/core/py_js/py";
import {isX2Many} from "@web/views/utils";
import {patch} from "@web/core/utils/patch";
import {session} from "@web/session";

const fieldColorProps = {
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
};

Many2OneField.props = {
...Many2OneField.props,
noSearchMore: {type: Boolean, optional: true},
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
...fieldColorProps,
};
Many2XAutocomplete.props = {
...Many2XAutocomplete.props,
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
...fieldColorProps,
};

KanbanMany2OneAvatarField.props = {
...KanbanMany2OneAvatarField.props,
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
...fieldColorProps,
};

Many2OneAvatarField.props = {
...Many2OneAvatarField.props,
noSearchMore: {type: Boolean, optional: true},
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
...fieldColorProps,
};

Many2ManyTagsField.props = {
...Many2ManyTagsField.props,
searchLimit: {type: Number, optional: true},
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
...fieldColorProps,
};

Many2ManyTagsFieldColorEditable.props = {
...Many2ManyTagsFieldColorEditable.props,
searchLimit: {type: Number, optional: true},
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
...fieldColorProps,
};

Many2ManyTagsAvatarField.props = {
...Many2ManyTagsAvatarField.props,
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
...fieldColorProps,
};

KanbanMany2ManyTagsAvatarField.props = {
...KanbanMany2ManyTagsAvatarField.props,
...fieldColorProps,
};

patch(many2OneField, {
Expand Down

0 comments on commit 777ea72

Please sign in to comment.