From e08762a99b3a0b74954d704b4f71ef777924226e Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Tue, 11 Jun 2019 13:15:10 +0000 Subject: [PATCH] [FIX] base: _get_eval_domain with localcontext MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before this commit, it was impossible to eval the domain if context_today was used in domain. closes odoo/odoo#34031 Signed-off-by: Jérémy Kersten (jke) --- odoo/addons/base/models/ir_filters.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/odoo/addons/base/models/ir_filters.py b/odoo/addons/base/models/ir_filters.py index 190e581e8dd..547302be38b 100644 --- a/odoo/addons/base/models/ir_filters.py +++ b/odoo/addons/base/models/ir_filters.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import ast +import datetime from odoo import api, fields, models, tools, _ from odoo.exceptions import UserError +from odoo.tools.safe_eval import safe_eval class IrFilters(models.Model): @@ -41,7 +42,10 @@ class IrFilters(models.Model): @api.multi def _get_eval_domain(self): self.ensure_one() - return ast.literal_eval(self.domain) + return safe_eval(self.domain, { + 'datetime': datetime, + 'context_today': datetime.datetime.now, + }) @api.model def _get_action_domain(self, action_id=None):