From 39f92c299343772261ec52a164edfdbff97a0775 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 23 Aug 2022 08:37:31 +0000 Subject: [PATCH] [IMP] point_of_sale: Remove pos_config_form js_class Purpose ======= The logic has been moved from the pos.config to the res.config.settings model/views, and therefore this js_class is not used anymore. closes odoo/odoo#98641 Taskid: 2958057 Related: odoo/enterprise#30658 Signed-off-by: Yannick Tivisse (yti) --- addons/point_of_sale/__manifest__.py | 1 - addons/point_of_sale/models/pos_config.py | 14 ------- .../backend/web_overrides/pos_config_form.js | 42 ------------------- .../point_of_sale/views/pos_config_view.xml | 2 +- 4 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 addons/point_of_sale/static/src/backend/web_overrides/pos_config_form.js diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py index e6de91910b3..bcdbc1f6d43 100644 --- a/addons/point_of_sale/__manifest__.py +++ b/addons/point_of_sale/__manifest__.py @@ -79,7 +79,6 @@ 'point_of_sale/static/src/scss/pos_dashboard.scss', 'point_of_sale/static/src/backend/tours/point_of_sale.js', 'point_of_sale/static/src/backend/debug_manager.js', - 'point_of_sale/static/src/backend/web_overrides/**/*.js', ], 'web.assets_tests': [ 'point_of_sale/static/tests/tours/**/*', diff --git a/addons/point_of_sale/models/pos_config.py b/addons/point_of_sale/models/pos_config.py index f2c06d8e790..da89b68187e 100644 --- a/addons/point_of_sale/models/pos_config.py +++ b/addons/point_of_sale/models/pos_config.py @@ -667,20 +667,6 @@ class PosConfig(models.Model): result = self.env.cr.fetchall() return result - @api.model - def are_there_uninstalled_modules(self, changed_fields): - modules_to_check = self._get_modules_to_check(changed_fields) - n_installed = self.env['ir.module.module'].search_count([('name', 'in', modules_to_check), ('state', '=', 'installed')]) - return n_installed != len(modules_to_check) - - @api.model - def _get_modules_to_check(self, changed_fields): - modules_to_check = [] - for field in changed_fields: - if field.startswith('module_'): - modules_to_check.append(field.replace('module_', '')) - return modules_to_check - def action_pos_config_modal_edit(self): return { 'view_mode': 'form', diff --git a/addons/point_of_sale/static/src/backend/web_overrides/pos_config_form.js b/addons/point_of_sale/static/src/backend/web_overrides/pos_config_form.js deleted file mode 100644 index e00d88e05cb..00000000000 --- a/addons/point_of_sale/static/src/backend/web_overrides/pos_config_form.js +++ /dev/null @@ -1,42 +0,0 @@ -odoo.define('point_of_sale.pos_config_form', function (require) { - 'use strict'; - - var FormController = require('web.FormController'); - var FormView = require('web.FormView'); - var viewRegistry = require('web.view_registry'); - var rpc = require('web.rpc'); - - var PosConfigFormController = FormController.extend({ - saveRecord: async function (recordID) { - const _super = this._super; - const record = this.model.localData[recordID || this.handle]; - const fieldsToChange = Object.keys( - this.model._generateChanges(record, { viewType: undefined, changesOnly: true }) - ); - let shouldReload = false; - if (fieldsToChange.length) { - shouldReload = await rpc.query( - rpc.buildQuery({ - model: 'pos.config', - method: 'are_there_uninstalled_modules', - args: [fieldsToChange], - }) - ); - } - const result = await _super.apply(this, arguments); - if (shouldReload) { - window.location.reload(); - } - return result; - }, - }); - - var PosConfigFormView = FormView.extend({ - config: _.extend({}, FormView.prototype.config, { - Controller: PosConfigFormController, - }), - }); - - viewRegistry.add('pos_config_form', PosConfigFormView); - return FormView; -}); diff --git a/addons/point_of_sale/views/pos_config_view.xml b/addons/point_of_sale/views/pos_config_view.xml index 81cfbf4c764..8c40aa35d7e 100644 --- a/addons/point_of_sale/views/pos_config_view.xml +++ b/addons/point_of_sale/views/pos_config_view.xml @@ -27,7 +27,7 @@ pos.config.form.view pos.config -
+