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

Merge PR #2957 into 17.0 

Signed-off-by pedrobaeza
pull/2958/head
OCA-git-bot 2024-10-15 07:29:01 +00:00
parent 8bdde59276 1f71e529e9
commit 098ccaa1ea
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web_m2x_options/static/description/index.html
View File

@ -8,11 +8,10 @@
/* /*
:Author: David Goodger (goodger@python.org) :Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Copyright: This stylesheet has been placed in the public domain. :Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils. Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet. customize this style sheet.
@ -275,7 +274,7 @@ pre.literal-block, pre.doctest-block, pre.math, pre.code {
margin-left: 2em ; margin-left: 2em ;
margin-right: 2em } margin-right: 2em }
pre.code .ln { color: gray; } /* line numbers */ pre.code .ln { color: grey; } /* line numbers */
pre.code, code { background-color: #eeeeee } pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 } pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@ -301,7 +300,7 @@ span.option {
span.pre { span.pre {
white-space: pre } white-space: pre }
span.problematic, pre.problematic { span.problematic {
color: red } color: red }
span.section-subtitle { span.section-subtitle {
@ -545,9 +544,7 @@ by Camptocamp</p>
<div class="section" id="maintainers"> <div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-11">Maintainers</a></h2> <h2><a class="toc-backref" href="#toc-entry-11">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p> <p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"> <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and mission is to support the collaborative development of Odoo features and
promote its widespread use.</p> promote its widespread use.</p>

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

@ -10,6 +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 {
ListMany2ManyTagsAvatarField,
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";
@ -56,6 +60,18 @@ Many2ManyTagsFieldColorEditable.props = {
fieldColorOptions: {type: Object, optional: true}, fieldColorOptions: {type: Object, optional: true},
}; };
ListMany2ManyTagsAvatarField.props = {
...ListMany2ManyTagsAvatarField.props,
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
};
Many2ManyTagsAvatarField.props = {
...Many2ManyTagsAvatarField.props,
fieldColor: {type: String, optional: true},
fieldColorOptions: {type: Object, optional: true},
};
patch(many2OneField, { patch(many2OneField, {
m2o_options_props_create(props, attrs, options) { m2o_options_props_create(props, attrs, options) {
const ir_options = session.web_m2x_options; const ir_options = session.web_m2x_options;