diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8a5999af4419f630dda23d9366b51967b8322ed3..732d0c4a644eb444d6b4385643ff32fab19fab52 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,10 +6,8 @@ exclude: | ^setup/|/static/description/index\.html$| # We don't want to mess with tool-generated files .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/| - # Maybe reactivate this when all README files include prettier ignore tags? - ^README\.md$| # Library files can have extraneous formatting (even minimized) - static/(src/)?lib/| + /static/(src/)?lib/| # Repos using Sphinx to generate docs don't need prettying ^docs/_templates/.*\.html$| # You don't usually want a bot to modify your legal texts @@ -28,7 +26,7 @@ repos: language: fail files: "\\.rej$" - repo: https://github.com/oca/maintainer-tools - rev: ab1d7f6 + rev: 7d8a9f9ad73db0976fb03cbee43d953bc29b89e9 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons @@ -46,11 +44,11 @@ repos: - --remove-duplicate-keys - --remove-unused-variables - repo: https://github.com/psf/black - rev: 20.8b1 + rev: 22.3.0 hooks: - id: black - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.1.2 + rev: v2.6.2 hooks: - id: prettier name: prettier (with plugin-xml) @@ -61,7 +59,7 @@ repos: - --plugin=@prettier/plugin-xml files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$ - repo: https://github.com/pre-commit/mirrors-eslint - rev: v7.8.1 + rev: v8.15.0 hooks: - id: eslint verbose: true @@ -69,7 +67,7 @@ repos: - --color - --fix - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.2.0 + rev: v4.2.0 hooks: - id: trailing-whitespace # exclude autogenerated files @@ -91,12 +89,12 @@ repos: - id: mixed-line-ending args: ["--fix=lf"] - repo: https://github.com/asottile/pyupgrade - rev: v2.7.2 + rev: v2.32.1 hooks: - id: pyupgrade args: ["--keep-percent-format"] - repo: https://github.com/PyCQA/isort - rev: 5.5.1 + rev: 5.10.1 hooks: - id: isort name: isort except __init__.py @@ -104,13 +102,13 @@ repos: - --settings=. exclude: /__init__\.py$ - repo: https://gitlab.com/PyCQA/flake8 - rev: 3.8.3 + rev: 3.9.2 hooks: - id: flake8 name: flake8 additional_dependencies: ["flake8-bugbear==20.1.4"] - repo: https://github.com/PyCQA/pylint - rev: pylint-2.5.3 + rev: v2.11.1 hooks: - id: pylint name: pylint with optional checks @@ -119,7 +117,7 @@ repos: - --exit-zero verbose: true additional_dependencies: &pylint_deps - - pylint-odoo==3.5.0 + - pylint-odoo==5.0.5 - id: pylint name: pylint with mandatory checks args: diff --git a/security/security_rules.xml b/security/security_rules.xml index 65821416d71898015777bd273cdeda4fd33138d1..e1ceedbf2b958d81e302250d0387c7020670ffcf 100644 --- a/security/security_rules.xml +++ b/security/security_rules.xml @@ -11,7 +11,9 @@ <record id="scop_resource_rule_ur" model="ir.rule"> <field name="name">resource rule per ur</field> <field name="model_id" ref="cgscop_resource.model_scop_resource" /> - <field name="domain_force">[('ur_id','=',user.current_user_ur_id.ur_id.id)]</field> + <field + name="domain_force" + >[('ur_id','=',user.current_user_ur_id.ur_id.id)]</field> <field name="groups" eval="[(6, 0, [ref('base.group_user')])]" /> <field name="global" eval="True" /> </record> @@ -19,7 +21,9 @@ <record id="scop_resource_rule_admin" model="ir.rule"> <field name="name">Calendar Event Admin</field> <field name="model_id" ref="calendar.model_calendar_event" /> - <field name="domain_force">[('ur_id','=',user.current_user_ur_id.ur_id.id)]</field> + <field + name="domain_force" + >[('ur_id','=',user.current_user_ur_id.ur_id.id)]</field> <field name="groups" eval="[(6, 0, [ref('cgscop_resource.group_admin_resource')])]" diff --git a/views/scop_resource.xml b/views/scop_resource.xml index e06a0b94f4041fa6dec2af3df9bbc27c9866bdf4..c3c1eea5312e0ce5fe5e70a53abb55ff0a55400b 100644 --- a/views/scop_resource.xml +++ b/views/scop_resource.xml @@ -319,17 +319,19 @@ color="user_id" quick_add="False" > - <field + <field name="user_id" + filters="1" options="{'no_open': True, 'no_create': True}" /> - <field + <field name="scop_resource_id" + filters="1" options="{'no_open': True, 'no_create': True}" /> - <field name="name" /> - <field name="coop_id" /> - <field name="description" /> + <field name="name" /> + <field name="coop_id" /> + <field name="description" /> </calendar> </field> </record>