From c031fde4d5b852bf13d41454ac42af47ec064333 Mon Sep 17 00:00:00 2001 From: "sergio.teruel" Date: Fri, 7 Sep 2018 11:35:46 +0200 Subject: [PATCH] [IMP] base_external_dbsource: Add company field to backend fw-port from b7f439e04a850b7de950d659adf112a02d009d10 --- base_external_dbsource/__manifest__.py | 8 ++++++-- .../migrations/13.0.2.0.0/noupdate_changes.xml | 8 ++++++++ .../migrations/13.0.2.0.0/post-migration.py | 11 +++++++++++ .../models/base_external_dbsource.py | 5 +++++ .../security/base_external_dbsource_security.xml | 11 +++++++++++ .../views/base_external_dbsource.xml | 5 +++++ 6 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 base_external_dbsource/migrations/13.0.2.0.0/noupdate_changes.xml create mode 100644 base_external_dbsource/migrations/13.0.2.0.0/post-migration.py create mode 100644 base_external_dbsource/security/base_external_dbsource_security.xml diff --git a/base_external_dbsource/__manifest__.py b/base_external_dbsource/__manifest__.py index a196c05d..6a5788c2 100644 --- a/base_external_dbsource/__manifest__.py +++ b/base_external_dbsource/__manifest__.py @@ -3,14 +3,18 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "External Database Sources", - "version": "13.0.1.0.0", + "version": "13.0.2.0.0", "category": "Tools", "author": "Daniel Reis, " "LasLabs, " "Odoo Community Association (OCA)", "website": "https://github.com/OCA/server-backend", "license": "LGPL-3", "images": ["images/screenshot01.png"], "depends": ["base"], - "data": ["views/base_external_dbsource.xml", "security/ir.model.access.csv"], + "data": [ + "views/base_external_dbsource.xml", + "security/ir.model.access.csv", + "security/base_external_dbsource_security.xml", + ], "demo": ["demo/base_external_dbsource.xml"], "installable": True, } diff --git a/base_external_dbsource/migrations/13.0.2.0.0/noupdate_changes.xml b/base_external_dbsource/migrations/13.0.2.0.0/noupdate_changes.xml new file mode 100644 index 00000000..5c424548 --- /dev/null +++ b/base_external_dbsource/migrations/13.0.2.0.0/noupdate_changes.xml @@ -0,0 +1,8 @@ + + + + ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)] + + diff --git a/base_external_dbsource/migrations/13.0.2.0.0/post-migration.py b/base_external_dbsource/migrations/13.0.2.0.0/post-migration.py new file mode 100644 index 00000000..042e8cad --- /dev/null +++ b/base_external_dbsource/migrations/13.0.2.0.0/post-migration.py @@ -0,0 +1,11 @@ +# Copyright 2022 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openupgradelib import openupgrade # pylint: disable=W7936 + + +@openupgrade.migrate() +def migrate(env, version): + openupgrade.load_data( + env.cr, "base_external_dbsource", "migrations/13.0.2.0.0/noupdate_changes.xml" + ) diff --git a/base_external_dbsource/models/base_external_dbsource.py b/base_external_dbsource/models/base_external_dbsource.py index 12653c1a..390843aa 100644 --- a/base_external_dbsource/models/base_external_dbsource.py +++ b/base_external_dbsource/models/base_external_dbsource.py @@ -58,6 +58,11 @@ class BaseExternalDbsource(models.Model): - Elasticsearch: https://user:%s@localhost:9200 """, ) + company_id = fields.Many2one( + comodel_name="res.company", + string="Company", + default=lambda self: self.env.user.company_id, + ) conn_string_full = fields.Text(readonly=True, compute="_compute_conn_string_full") password = fields.Char("Password", size=40) client_cert = fields.Text() diff --git a/base_external_dbsource/security/base_external_dbsource_security.xml b/base_external_dbsource/security/base_external_dbsource_security.xml new file mode 100644 index 00000000..a02093c4 --- /dev/null +++ b/base_external_dbsource/security/base_external_dbsource_security.xml @@ -0,0 +1,11 @@ + + + + External Database Source Multicompany + + + ['|', ('company_id', '=', False), ('company_id', 'in', company_ids)] + + diff --git a/base_external_dbsource/views/base_external_dbsource.xml b/base_external_dbsource/views/base_external_dbsource.xml index bad90c02..aaa7d2e8 100644 --- a/base_external_dbsource/views/base_external_dbsource.xml +++ b/base_external_dbsource/views/base_external_dbsource.xml @@ -22,6 +22,11 @@ +