From ebb531f4a4fc5672ebaef76482fe1220677e7167 Mon Sep 17 00:00:00 2001 From: Xavier-Do Date: Thu, 22 Jun 2023 14:22:47 +0200 Subject: [PATCH] [FIX] runbot: adapt for 16.0 --- runbot/models/__init__.py | 2 +- runbot/models/build.py | 3 +++ runbot/models/ir_qweb.py | 13 +++++++++++++ runbot/models/ir_ui_view.py | 15 --------------- 4 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 runbot/models/ir_qweb.py delete mode 100644 runbot/models/ir_ui_view.py diff --git a/runbot/models/__init__.py b/runbot/models/__init__.py index 4f0bc341..3cec81e4 100644 --- a/runbot/models/__init__.py +++ b/runbot/models/__init__.py @@ -15,7 +15,7 @@ from . import dockerfile from . import event from . import host from . import ir_cron -from . import ir_ui_view +from . import ir_qweb from . import project from . import repo from . import res_config_settings diff --git a/runbot/models/build.py b/runbot/models/build.py index 15af1f96..b8518e51 100644 --- a/runbot/models/build.py +++ b/runbot/models/build.py @@ -991,6 +991,9 @@ class BuildResult(models.Model): child._ask_kill(lock=False) def _wake_up(self): + + user = request.env.user if request else self.env.user + self._log('wake_up', f'Wake up initiated by {user.name}') if self.local_state != 'done': self._log('wake_up', 'Impossibe to wake up, state is not done') else: diff --git a/runbot/models/ir_qweb.py b/runbot/models/ir_qweb.py new file mode 100644 index 00000000..936d3e46 --- /dev/null +++ b/runbot/models/ir_qweb.py @@ -0,0 +1,13 @@ +from ..common import s2human, s2human_long +from odoo import models +from odoo.http import request + + +class IrQweb(models.AbstractModel): + _inherit = ["ir.qweb"] + + def _prepare_frontend_environment(self, values): + response = super()._prepare_frontend_environment(values) + values['s2human'] = s2human + values['s2human_long'] = s2human_long + return response diff --git a/runbot/models/ir_ui_view.py b/runbot/models/ir_ui_view.py deleted file mode 100644 index 08e4ba3e..00000000 --- a/runbot/models/ir_ui_view.py +++ /dev/null @@ -1,15 +0,0 @@ -from ..common import s2human, s2human_long -from odoo import models -from odoo.http import request - - -class IrUiView(models.Model): - _inherit = ["ir.ui.view"] - - def _prepare_qcontext(self): - qcontext = super(IrUiView, self)._prepare_qcontext() - - if request and getattr(request, 'is_frontend', False): - qcontext['s2human'] = s2human - qcontext['s2human_long'] = s2human_long - return qcontext