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

Merge PR #2649 into 14.0 

Signed-off-by pedrobaeza
pull/2656/head
OCA-git-bot 2023-10-30 16:07:39 +00:00
parent b8a9e6dff0 ee19af1587
commit 4a5dca68fb
14 changed files with 228 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.copier-answers.yml
View File

@ -1,8 +1,7 @@
# Do NOT update manually; changes here will be overwritten by Copier # Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.14.2 _commit: v1.17.2
_src_path: gh:oca/oca-addons-repo-template _src_path: gh:oca/oca-addons-repo-template
ci: GitHub ci: GitHub
dependency_installation_mode: PIP
generate_requirements_txt: true generate_requirements_txt: true
github_check_license: true github_check_license: true
github_ci_extra_env: {} github_ci_extra_env: {}
@ -11,6 +10,7 @@ github_enable_makepot: true
github_enable_stale_action: true github_enable_stale_action: true
github_enforce_dev_status_compatibility: true github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false include_wkhtmltopdf: false
odoo_test_flavor: Both
odoo_version: 14.0 odoo_version: 14.0
org_name: Odoo Community Association (OCA) org_name: Odoo Community Association (OCA)
org_slug: OCA org_slug: OCA
@ -22,6 +22,4 @@ repo_description: "This project aims to deal with modules related to the webclie
repo_name: Web addons for Odoo repo_name: Web addons for Odoo
repo_slug: web repo_slug: web
repo_website: https://github.com/OCA/web repo_website: https://github.com/OCA/web
travis_apt_packages: []
travis_apt_sources: []

1
.eslintrc.yml
View File

@ -22,6 +22,7 @@ globals:
odoo: readonly odoo: readonly
openerp: readonly openerp: readonly
owl: readonly owl: readonly
luxon: readonly
# Styling is handled by Prettier, so we only need to enable AST rules; # Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890 # see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890

15
.github/workflows/pre-commit.yml vendored
View File

@ -13,10 +13,10 @@ jobs:
pre-commit: pre-commit:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-python@v4 - uses: actions/setup-python@v2
with: with:
python-version: "3.10" python-version: "3.11"
- name: Get python version - name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1 - uses: actions/cache@v1
@ -27,6 +27,15 @@ jobs:
run: pip install pre-commit run: pip install pre-commit
- name: Run pre-commit - name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always run: pre-commit run --all-files --show-diff-on-failure --color=always
env:
# Consider valid a PR that changes README fragments but doesn't
# change the README.rst file itself. It's not really a problem
# because the bot will update it anyway after merge. This way, we
# lower the barrier for functional contributors that want to fix the
# readme fragments, while still letting developers get README
# auto-generated (which also helps functionals when using runboat).
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
SKIP: oca-gen-addon-readme
- name: Check that all files generated by pre-commit are in git - name: Check that all files generated by pre-commit are in git
run: | run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)" newfiles="$(git ls-files --others --exclude-from=.gitignore)"

9
.github/workflows/stale.yml.rej vendored
View File

@ -1,9 +0,0 @@
diff a/.github/workflows/stale.yml b/.github/workflows/stale.yml (rejected hunks)
@@ -15,2 +15,3 @@ jobs:
# General settings.
+ ascending: true
remove-stale-when-updated: true
@@ -52,2 +53,3 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
+ ascending: true
only-labels: "needs more information"

8
.github/workflows/test.yml vendored
View File

@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Detect unreleased dependencies name: Detect unreleased dependencies
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- run: | - run: |
for reqfile in requirements.txt test-requirements.txt ; do for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then if [ -f ${reqfile} ] ; then
@ -37,18 +37,18 @@ jobs:
include: include:
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
include: "web_widget_model_viewer" include: "web_widget_model_viewer"
makepot: "true"
name: test with Odoo name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
include: "web_widget_model_viewer" include: "web_widget_model_viewer"
name: test with OCB name: test with OCB
makepot: "true"
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
exclude: "web_widget_model_viewer" exclude: "web_widget_model_viewer"
makepot: "true"
name: test with Odoo name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
exclude: "web_widget_model_viewer" exclude: "web_widget_model_viewer"
name: test with OCB name: test with OCB
makepot: "true"
services: services:
postgres: postgres:
image: postgres:9.6 image: postgres:9.6
@ -62,7 +62,7 @@ jobs:
INCLUDE: "${{ matrix.include }}" INCLUDE: "${{ matrix.include }}"
EXCLUDE: "${{ matrix.exclude }}" EXCLUDE: "${{ matrix.exclude }}"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
persist-credentials: false persist-credentials: false
- name: Install addons and dependencies - name: Install addons and dependencies

16
.pre-commit-config.yaml
View File

@ -12,6 +12,8 @@ exclude: |
/static/(src/)?lib/| /static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying # Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$| ^docs/_templates/.*\.html$|
# Don't bother non-technical authors with formatting issues in docs
readme/.*\.(rst|md)$|
# You don't usually want a bot to modify your legal texts # You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*) (LICENSE.*|COPYING.*)
default_language_version: default_language_version:
@ -33,12 +35,24 @@ repos:
language: fail language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$' files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools - repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6 rev: 969238e47c07d0c40573acff81d170f63245d738
hooks: hooks:
# update the NOT INSTALLABLE ADDONS section above # update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons - id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website - id: oca-fix-manifest-website
args: ["https://github.com/OCA/web"] args: ["https://github.com/OCA/web"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=web
- --if-source-changed
- repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.25
hooks:
- id: oca-checks-odoo-module
- id: oca-checks-po
- repo: https://github.com/myint/autoflake - repo: https://github.com/myint/autoflake
rev: v1.4 rev: v1.4
hooks: hooks:

42
support_branding/demo/ir_config_parameter_data.xml
View File

@ -1,25 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<odoo> <odoo>
<data noupdate="0"> <record id="demo_config_parameter_company_name" model="ir.config_parameter">
<record id="demo_config_parameter_company_name" model="ir.config_parameter"> <field name="key">support_company</field>
<field name="key">support_company</field> <field name="value">Odoo Community Association</field>
<field name="value">Odoo Community Association</field> </record>
</record> <record id="demo_config_parameter_company_url" model="ir.config_parameter">
<record id="demo_config_parameter_company_url" model="ir.config_parameter"> <field name="key">support_company_url</field>
<field name="key">support_company_url</field> <field name="value">https://odoo-community.org</field>
<field name="value">https://odoo-community.org</field> </record>
</record> <record id="demo_config_parameter_company_color" model="ir.config_parameter">
<record id="demo_config_parameter_company_color" model="ir.config_parameter"> <field name="key">support_branding_color</field>
<field name="key">support_branding_color</field> <field name="value">#fff</field>
<field name="value">#fff</field> </record>
</record> <record id="demo_config_parameter_support_email" model="ir.config_parameter">
<record id="demo_config_parameter_support_email" model="ir.config_parameter"> <field name="key">support_email</field>
<field name="key">support_email</field> <field name="value">oca@example.com</field>
<field name="value">oca@example.com</field> </record>
</record> <record id="demo_config_parameter_release" model="ir.config_parameter">
<record id="demo_config_parameter_release" model="ir.config_parameter"> <field name="key">support_release</field>
<field name="key">support_release</field> <field name="value">14.0</field>
<field name="value">14.0</field> </record>
</record>
</data>
</odoo> </odoo>

18
web_create_write_confirm/views/assets.xml
View File

@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<data>
<template id="assets_backend_extension" inherit_id="web.assets_backend"> <template id="assets_backend_extension" inherit_id="web.assets_backend">
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<script <script
type="text/javascript" type="text/javascript"
src="/web_create_write_confirm/static/src/js/pop_up_confirmation.js" src="/web_create_write_confirm/static/src/js/pop_up_confirmation.js"
/> />
</xpath> </xpath>
</template> </template>
</data>
</odoo> </odoo>

134
web_create_write_confirm/views/popup_message.xml
View File

@ -1,78 +1,76 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<data>
<record id="view_popup_message_tree" model="ir.ui.view"> <record id="view_popup_message_tree" model="ir.ui.view">
<field name="name">view.popup.message.tree</field> <field name="name">view.popup.message.tree</field>
<field name="model">popup.message</field> <field name="model">popup.message</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Popup Message"> <tree>
<field name="model_id" /> <field name="model_id" />
<field name="field_ids" widget="many2many_tags" /> <field name="field_ids" widget="many2many_tags" />
<field name="popup_type" /> <field name="popup_type" />
<field name="title" /> <field name="title" />
<field name="message" /> <field name="message" />
<field name="active" /> <field name="active" />
</tree> </tree>
</field> </field>
</record> </record>
<record id="view_popup_message_form" model="ir.ui.view"> <record id="view_popup_message_form" model="ir.ui.view">
<field name="name">view.popup.message.form</field> <field name="name">view.popup.message.form</field>
<field name="model">popup.message</field> <field name="model">popup.message</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Popup Message"> <form string="Popup Message">
<sheet> <sheet>
<widget <widget
name="web_ribbon" name="web_ribbon"
title="Archived" title="Archived"
bg_color="bg-danger" bg_color="bg-danger"
attrs="{'invisible': [('active', '=', True)]}" attrs="{'invisible': [('active', '=', True)]}"
/>
<group>
<field name="model_id" />
<field name="model" invisible="1" />
<field
name="field_ids"
domain="[('model','=',model)]"
widget="many2many_tags"
/> />
<group> <field name="popup_type" />
<field name="model_id" /> <field name="title" />
<field name="model" invisible="1" /> <field name="message" />
<field <field name="active" widget="boolean_toggle" />
name="field_ids" </group>
domain="[('model','=',model)]" </sheet>
widget="many2many_tags" </form>
/> </field>
<field name="popup_type" /> </record>
<field name="title" />
<field name="message" />
<field name="active" widget="boolean_toggle" />
</group>
</sheet>
</form>
</field>
</record>
<record id="action_popup_message_view" model="ir.actions.act_window"> <record id="action_popup_message_view" model="ir.actions.act_window">
<field name="name">Popup message</field> <field name="name">Popup message</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">popup.message</field> <field name="res_model">popup.message</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="help" type="html"> <field name="help" type="html">
<p class="oe_view_nocontent_create"> <p class="oe_view_nocontent_create">
Add your pop-up! Add your pop-up!
</p> </p>
</field> </field>
</record> </record>
<menuitem <menuitem
id="menu_popup_message_categ" id="menu_popup_message_categ"
name="Popup message" name="Popup message"
parent="base.menu_custom" parent="base.menu_custom"
sequence="90" sequence="90"
/> />
<menuitem <menuitem
id="menu_popup_message_view" id="menu_popup_message_view"
name="Popup message" name="Popup message"
parent="web_create_write_confirm.menu_popup_message_categ" parent="web_create_write_confirm.menu_popup_message_categ"
action="action_popup_message_view" action="action_popup_message_view"
sequence="10" sequence="10"
/> />
</data>
</odoo> </odoo>

6
web_field_required_invisible_manager/views/views.xml
View File

@ -15,7 +15,7 @@
nolabel="1" nolabel="1"
context="{'default_required_model_id': model}" context="{'default_required_model_id': model}"
> >
<tree string="Fields"> <tree>
<field name="required_model_id" invisible="1" /> <field name="required_model_id" invisible="1" />
<field name="invisible_model_id" invisible="1" /> <field name="invisible_model_id" invisible="1" />
<field name="model_name" invisible="1" /> <field name="model_name" invisible="1" />
@ -45,7 +45,7 @@
nolabel="1" nolabel="1"
context="{'default_invisible_model_id': model}" context="{'default_invisible_model_id': model}"
> >
<tree string="Fields"> <tree>
<field name="required_model_id" invisible="1" /> <field name="required_model_id" invisible="1" />
<field name="invisible_model_id" invisible="1" /> <field name="invisible_model_id" invisible="1" />
<field name="model_name" invisible="1" /> <field name="model_name" invisible="1" />
@ -72,7 +72,7 @@
nolabel="1" nolabel="1"
context="{'default_readonly_model_id': model}" context="{'default_readonly_model_id': model}"
> >
<tree string="Fields"> <tree>
<field name="required_model_id" invisible="1" /> <field name="required_model_id" invisible="1" />
<field name="invisible_model_id" invisible="1" /> <field name="invisible_model_id" invisible="1" />
<field name="readonly_model_id" invisible="1" /> <field name="readonly_model_id" invisible="1" />

2
web_m2x_options_manager/views/ir_model.xml
View File

@ -17,7 +17,7 @@
nolabel="1" nolabel="1"
context="{'default_model_name': model}" context="{'default_model_name': model}"
> >
<tree string="Fields Description" editable="bottom"> <tree editable="bottom">
<field name="model_name" invisible="1" /> <field name="model_name" invisible="1" />
<field <field
name="field_id" name="field_id"

50
web_no_bubble/views/web_no_bubble.xml
View File

@ -1,29 +1,27 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<data> <template
<template id="assets_backend"
id="assets_backend" name="web_no_bubble_assets"
name="web_no_bubble_assets" inherit_id="web.assets_backend"
inherit_id="web.assets_backend" >
> <xpath expr="." position="inside">
<xpath expr="." position="inside"> <link
<link rel="stylesheet"
rel="stylesheet" href="/web_no_bubble/static/src/css/web_no_bubble.scss"
href="/web_no_bubble/static/src/css/web_no_bubble.scss" />
/> </xpath>
</xpath> </template>
</template> <template
<template id="assets_frontend"
id="assets_frontend" name="web_no_bubble_assets_frontend"
name="web_no_bubble_assets_frontend" inherit_id="web.assets_frontend"
inherit_id="web.assets_frontend" >
> <xpath expr="." position="inside">
<xpath expr="." position="inside"> <link
<link rel="stylesheet"
rel="stylesheet" href="/web_no_bubble/static/src/css/web_no_bubble.scss"
href="/web_no_bubble/static/src/css/web_no_bubble.scss" />
/> </xpath>
</xpath> </template>
</template>
</data>
</odoo> </odoo>

121
web_pwa_oca/views/res_config_settings_views.xml
View File

@ -1,72 +1,67 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<data> <record id="res_config_settings_view_form" model="ir.ui.view">
<record id="res_config_settings_view_form" model="ir.ui.view"> <field name="name">res.config.settings.view.form.pwa</field>
<field name="name">res.config.settings.view.form.pwa</field> <field name="model">res.config.settings</field>
<field name="model">res.config.settings</field> <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
<field name="inherit_id" ref="base_setup.res_config_settings_view_form" /> <field name="arch" type="xml">
<field name="arch" type="xml"> <div id="emails" position='after'>
<div id="emails" position='after'> <h2>Progressive Web App</h2>
<h2>Progressive Web App</h2> <div class="row mt16 o_settings_container" id="pwa_settings">
<div class="row mt16 o_settings_container" id="pwa_settings"> <div class="col-12 col-lg-6 o_setting_box" id="domain_setting">
<div class="col-12 col-lg-6 o_setting_box" id="domain_setting"> <div class="o_setting_right_pane">
<div class="o_setting_right_pane"> <label for="pwa_name" string="PWA Title" />
<label for="pwa_name" string="PWA Title" /> <span class="fa fa-lg fa-globe" title="Icon next to name" />
<span <div class="text-muted">
class="fa fa-lg fa-globe" Name and icon of your PWA
title="Icon next to name" </div>
/> <div class="content-group">
<div class="text-muted"> <div class="row mt16">
Name and icon of your PWA <label
class="col-lg-3 o_light_label"
string="Name"
for="pwa_name"
/>
<field name="pwa_name" />
</div> </div>
<div class="content-group"> <div class="row mt16">
<div class="row mt16"> <label
<label class="col-lg-3 o_light_label"
class="col-lg-3 o_light_label" string="Short Name"
string="Name" for="pwa_short_name"
for="pwa_name" />
/> <field name="pwa_short_name" />
<field name="pwa_name" /> </div>
</div> <div class="row">
<div class="row mt16"> <label
<label class="col-lg-3 o_light_label"
class="col-lg-3 o_light_label" for="pwa_background_color"
string="Short Name" />
for="pwa_short_name" <field name="pwa_background_color" />
/> </div>
<field name="pwa_short_name" /> <div class="row">
</div> <label
<div class="row"> class="col-lg-3 o_light_label"
<label for="pwa_theme_color"
class="col-lg-3 o_light_label" />
for="pwa_background_color" <field name="pwa_theme_color" />
/> </div>
<field name="pwa_background_color" /> <div class="row">
</div> <label
<div class="row"> class="col-lg-3 o_light_label"
<label for="pwa_icon"
class="col-lg-3 o_light_label" />
for="pwa_theme_color" <field
/> name="pwa_icon"
<field name="pwa_theme_color" /> widget="image"
</div> class="float-left oe_avatar"
<div class="row"> />
<label
class="col-lg-3 o_light_label"
for="pwa_icon"
/>
<field
name="pwa_icon"
widget="image"
class="float-left oe_avatar"
/>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</field> </div>
</record> </field>
</data> </record>
</odoo> </odoo>

30
web_switch_context_warning/view/view.xml
View File

@ -1,17 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<openerp> <odoo>
<data> <template
<template id="assets_backend"
id="assets_backend" name="web_switch_context_warning assets"
name="web_switch_context_warning assets" inherit_id="web.assets_backend"
inherit_id="web.assets_backend" >
> <xpath expr="." position="inside">
<xpath expr="." position="inside"> <script
<script type="text/javascript"
type="text/javascript" src="/web_switch_context_warning/static/src/js/switch_context_warning.js"
src="/web_switch_context_warning/static/src/js/switch_context_warning.js" />
/> </xpath>
</xpath> </template>
</template> </odoo>
</data>
</openerp>