From b8f4bdfb5ce25a8ef6e8c6e8e173b67106b0d592 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Sat, 18 May 2024 18:50:57 +0100 Subject: [PATCH 1/4] [REF] web_dashboard_tile: pre-commit fixes --- web_dashboard_tile/migrations/post-migration.py | 2 ++ web_dashboard_tile/models/tile_tile.py | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/web_dashboard_tile/migrations/post-migration.py b/web_dashboard_tile/migrations/post-migration.py index b6c7c0f7f..7251dfb4f 100644 --- a/web_dashboard_tile/migrations/post-migration.py +++ b/web_dashboard_tile/migrations/post-migration.py @@ -1,6 +1,8 @@ # Copyright (C) 2023-Today: GRAP () # @author: Sylvain LE GAL (https://twitter.com/legalsylvain) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +# pylint: disable=C7902 import logging from openupgradelib import openupgrade diff --git a/web_dashboard_tile/models/tile_tile.py b/web_dashboard_tile/models/tile_tile.py index dce1dc004..480e4f457 100644 --- a/web_dashboard_tile/models/tile_tile.py +++ b/web_dashboard_tile/models/tile_tile.py @@ -10,7 +10,7 @@ from dateutil.relativedelta import relativedelta from collections import OrderedDict from odoo import api, fields, models -from odoo.tools.safe_eval import safe_eval as eval +from odoo.tools.safe_eval import safe_eval from odoo.tools.translate import _ from odoo.exceptions import ValidationError, except_orm @@ -202,7 +202,7 @@ class TileTile(models.Model): eval_context = self._get_eval_context() domain = tile.domain or "[]" try: - count = model.search_count(eval(domain, eval_context)) + count = model.search_count(safe_eval(domain, eval_context)) except Exception as e: tile.primary_value = 0.0 tile.primary_formated_value =\ @@ -216,7 +216,7 @@ class TileTile(models.Model): ] read_vals = ( fields - and model.search_read(eval(domain, eval_context), fields) + and model.search_read(safe_eval(domain, eval_context), fields) or [] ) for f in ["primary_", "secondary_"]: @@ -261,13 +261,13 @@ class TileTile(models.Model): f_helper = f + "helper" tile[f_helper] = "" field_func = FIELD_FUNCTIONS.get(tile[f_function], {}) - help = field_func.get("help", False) - if help: + help_text = field_func.get("help", False) + if help_text: if tile[f_function] != "count" and tile[f_field_id]: desc = tile[f_field_id].field_description - tile[f_helper] = help % desc + tile[f_helper] = help_text % desc else: - tile[f_helper] = help + tile[f_helper] = help_text def _compute_active(self): ima = self.env["ir.model.access"] From e68bc69de3f677e96433f855bae03d1af6018648 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Sat, 18 May 2024 18:51:36 +0100 Subject: [PATCH 2/4] [FIX] web_tree_image_tooltip: pre-commit fix --- web_tree_image_tooltip/readme/CONFIGURE.rst | 3 ++- web_tree_image_tooltip/readme/CONTRIBUTORS.rst | 2 -- web_tree_image_tooltip/readme/CREDITS.rst | 1 - web_tree_image_tooltip/readme/DESCRIPTION.rst | 2 +- web_tree_image_tooltip/readme/USAGE.rst | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/web_tree_image_tooltip/readme/CONFIGURE.rst b/web_tree_image_tooltip/readme/CONFIGURE.rst index 75b370d3c..19194659f 100644 --- a/web_tree_image_tooltip/readme/CONFIGURE.rst +++ b/web_tree_image_tooltip/readme/CONFIGURE.rst @@ -11,4 +11,5 @@ you can write the following code to reduce the load duration of the tree view. .. code:: xml - \ No newline at end of file + + diff --git a/web_tree_image_tooltip/readme/CONTRIBUTORS.rst b/web_tree_image_tooltip/readme/CONTRIBUTORS.rst index 89dc49395..d666a73a7 100644 --- a/web_tree_image_tooltip/readme/CONTRIBUTORS.rst +++ b/web_tree_image_tooltip/readme/CONTRIBUTORS.rst @@ -4,5 +4,3 @@ * Meet Dholakia * Nikul Chaudhary * Sylvain LE GAL (https://www.twitter.com/legalsylvain) - - diff --git a/web_tree_image_tooltip/readme/CREDITS.rst b/web_tree_image_tooltip/readme/CREDITS.rst index 7356ac20b..09b1864e3 100644 --- a/web_tree_image_tooltip/readme/CREDITS.rst +++ b/web_tree_image_tooltip/readme/CREDITS.rst @@ -1,2 +1 @@ * Serpent Consulting Services Pvt. Ltd. - diff --git a/web_tree_image_tooltip/readme/DESCRIPTION.rst b/web_tree_image_tooltip/readme/DESCRIPTION.rst index cc26fccc8..2796f0353 100644 --- a/web_tree_image_tooltip/readme/DESCRIPTION.rst +++ b/web_tree_image_tooltip/readme/DESCRIPTION.rst @@ -1,4 +1,4 @@ This module defines a images and icons in tree view via Tooltip. Additionally, Default width with 30px. -.. image:: ../static/description/tree_view_image.png \ No newline at end of file +.. image:: ../static/description/tree_view_image.png diff --git a/web_tree_image_tooltip/readme/USAGE.rst b/web_tree_image_tooltip/readme/USAGE.rst index a23a87929..037ec3259 100644 --- a/web_tree_image_tooltip/readme/USAGE.rst +++ b/web_tree_image_tooltip/readme/USAGE.rst @@ -1,3 +1,3 @@ Mouse Hover in tree view image that time Tooltip effect. -.. image:: ../static/description/tree_view_image_tooltip.png \ No newline at end of file +.. image:: ../static/description/tree_view_image_tooltip.png From dc12be1007f744287dc36e625b60ed3cc7559131 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Sat, 18 May 2024 18:52:33 +0100 Subject: [PATCH 3/4] [REF] web_view_calendar_column: pre-commit fix --- .../static/src/js/calendar_model.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/web_view_calendar_column/static/src/js/calendar_model.js b/web_view_calendar_column/static/src/js/calendar_model.js index fca22ed12..1ac666015 100644 --- a/web_view_calendar_column/static/src/js/calendar_model.js +++ b/web_view_calendar_column/static/src/js/calendar_model.js @@ -44,14 +44,14 @@ odoo.define('web_view_calendar_column.CalendarModel', function (require) { _getFullCalendarOptions: function () { var result = this._super.apply(this, arguments); if (this.fieldColumn) - result.resources = []; - return result; - }, - calendarEventToRecord: function (event) { - var result = this._super.apply(this, arguments); - if (event.resourceId) - result[this.fieldColumn] = event.resourceId; - return result; - }, + result.resources = []; + return result; + }, + calendarEventToRecord: function (event) { + var result = this._super.apply(this, arguments); + if (event.resourceId) + result[this.fieldColumn] = event.resourceId; + return result; + }, }); }); From 7249d30d68f6cc3c8a7cc9d09577bec5d584aac9 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Sat, 18 May 2024 18:53:20 +0100 Subject: [PATCH 4/4] [REF] web_view_searchpanel: pre-commit fix --- web_view_searchpanel/readme/CONTRIBUTORS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_view_searchpanel/readme/CONTRIBUTORS.rst b/web_view_searchpanel/readme/CONTRIBUTORS.rst index 1c5c42ceb..671a4442e 100644 --- a/web_view_searchpanel/readme/CONTRIBUTORS.rst +++ b/web_view_searchpanel/readme/CONTRIBUTORS.rst @@ -1,2 +1,2 @@ * Mathias Markl -* Enric Tobella \ No newline at end of file +* Enric Tobella