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

Merge PR #2959 into 17.0 

Signed-off-by pedrobaeza
pull/2966/head
OCA-git-bot 2024-10-16 09:39:31 +00:00
parent ede5920018 bb4b8a27dc
commit 777ea72e2f
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
web_m2x_options/static/src/components/form.esm.js
View File

@ -10,7 +10,10 @@ import {
KanbanMany2OneAvatarField, KanbanMany2OneAvatarField,
Many2OneAvatarField, Many2OneAvatarField,
} from "@web/views/fields/many2one_avatar/many2one_avatar_field"; } 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 {Many2XAutocomplete} from "@web/views/fields/relational_utils";
import {evaluateBooleanExpr} from "@web/core/py_js/py"; import {evaluateBooleanExpr} from "@web/core/py_js/py";
@ -18,49 +21,52 @@ import {isX2Many} from "@web/views/utils";
import {patch} from "@web/core/utils/patch"; import {patch} from "@web/core/utils/patch";
import {session} from "@web/session"; import {session} from "@web/session";
Many2OneField.props = { const fieldColorProps = {
...Many2OneField.props,
noSearchMore: {type: Boolean, optional: true},
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
};
Many2XAutocomplete.props = {
...Many2XAutocomplete.props,
fieldColor: {type: String, optional: true}, fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true}, fieldColorOptions: {type: Object, optional: true},
}; };
Many2OneField.props = {
...Many2OneField.props,
noSearchMore: {type: Boolean, optional: true},
...fieldColorProps,
};
Many2XAutocomplete.props = {
...Many2XAutocomplete.props,
...fieldColorProps,
};
KanbanMany2OneAvatarField.props = { KanbanMany2OneAvatarField.props = {
...KanbanMany2OneAvatarField.props, ...KanbanMany2OneAvatarField.props,
fieldColor: {type: String, optional: true}, ...fieldColorProps,
fieldColorOptions: {type: Object, optional: true},
}; };
Many2OneAvatarField.props = { Many2OneAvatarField.props = {
...Many2OneAvatarField.props, ...Many2OneAvatarField.props,
noSearchMore: {type: Boolean, optional: true}, noSearchMore: {type: Boolean, optional: true},
fieldColor: {type: String, optional: true}, ...fieldColorProps,
fieldColorOptions: {type: Object, optional: true},
}; };
Many2ManyTagsField.props = { Many2ManyTagsField.props = {
...Many2ManyTagsField.props, ...Many2ManyTagsField.props,
searchLimit: {type: Number, optional: true}, searchLimit: {type: Number, optional: true},
fieldColor: {type: String, optional: true}, ...fieldColorProps,
fieldColorOptions: {type: Object, optional: true},
}; };
Many2ManyTagsFieldColorEditable.props = { Many2ManyTagsFieldColorEditable.props = {
...Many2ManyTagsFieldColorEditable.props, ...Many2ManyTagsFieldColorEditable.props,
searchLimit: {type: Number, optional: true}, searchLimit: {type: Number, optional: true},
fieldColor: {type: String, optional: true}, ...fieldColorProps,
fieldColorOptions: {type: Object, optional: true},
}; };
Many2ManyTagsAvatarField.props = { Many2ManyTagsAvatarField.props = {
...Many2ManyTagsAvatarField.props, ...Many2ManyTagsAvatarField.props,
fieldColor: {type: String, optional: true}, ...fieldColorProps,
fieldColorOptions: {type: Object, optional: true}, };
KanbanMany2ManyTagsAvatarField.props = {
...KanbanMany2ManyTagsAvatarField.props,
...fieldColorProps,
}; };
patch(many2OneField, { patch(many2OneField, {