From 92ebf2dc2a778f5665ef0f6f60a3acf7a36c74cc Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 13 Feb 2019 15:42:13 +0100 Subject: [PATCH] [FIX] base_suspend_security: Adapt to upstream On 9af8b31d921dcccb7bcf230271fd3ef4R4329, a new keyword argument was added for `_browse`, so any overriding needs to add that argument, as it's the case for this module. --- base_suspend_security/README.rst | 7 ++++ base_suspend_security/models/res_users.py | 4 +-- base_suspend_security/readme/INSTALL.rst | 3 ++ .../static/description/index.html | 34 +++++++++++-------- 4 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 base_suspend_security/readme/INSTALL.rst diff --git a/base_suspend_security/README.rst b/base_suspend_security/README.rst index af5e26d7..e336c651 100644 --- a/base_suspend_security/README.rst +++ b/base_suspend_security/README.rst @@ -34,6 +34,13 @@ Usually, you'll be in in the situation to want something like this if you inheri .. contents:: :local: +Installation +============ + +This version is only valid for being used since Odoo commit +dcc752aaabc10aee8bbccc1474b43d224b57023c (merged on 2019-02-20). + + Usage ===== diff --git a/base_suspend_security/models/res_users.py b/base_suspend_security/models/res_users.py index c0741deb..bb7f3757 100644 --- a/base_suspend_security/models/res_users.py +++ b/base_suspend_security/models/res_users.py @@ -9,11 +9,11 @@ class ResUsers(models.Model): _inherit = 'res.users' @classmethod - def _browse(cls, ids, env, prefetch=None): + def _browse(cls, ids, env, prefetch=None, add_prefetch=True): """be sure we browse ints, ids laread is normalized""" return super(ResUsers, cls)._browse( [ i if not isinstance(i, BaseSuspendSecurityUid) else super(BaseSuspendSecurityUid, i).__int__() for i in ids - ], env, prefetch=prefetch) + ], env, prefetch=prefetch, add_prefetch=add_prefetch) diff --git a/base_suspend_security/readme/INSTALL.rst b/base_suspend_security/readme/INSTALL.rst new file mode 100644 index 00000000..883d018c --- /dev/null +++ b/base_suspend_security/readme/INSTALL.rst @@ -0,0 +1,3 @@ +This version is only valid for being used since Odoo commit +dcc752aaabc10aee8bbccc1474b43d224b57023c (merged on 2019-02-20). + diff --git a/base_suspend_security/static/description/index.html b/base_suspend_security/static/description/index.html index 4ab20f39..9475e14c 100644 --- a/base_suspend_security/static/description/index.html +++ b/base_suspend_security/static/description/index.html @@ -373,19 +373,25 @@ ul.auto-toc {

Table of contents

+
+

Installation

+

This version is only valid for being used since Odoo commit +dcc752aaabc10aee8bbccc1474b43d224b57023c (merged on 2019-02-20).

+
-

Usage

+

Usage

To use this module, you need to:

-

Known issues / Roadmap

+

Known issues / Roadmap

-

Bug Tracker

+

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed @@ -411,16 +417,16 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

Do not contact contributors directly about support or help with technical issues.

-

Credits

+

Credits

-

Authors

+

Authors

  • Therp BV
  • brain-tec AG
-

Contributors

+

Contributors

-

Maintainers

+

Maintainers

This module is maintained by the OCA.

Odoo Community Association

OCA, or the Odoo Community Association, is a nonprofit organization whose