From b35d103cc0fe64547c3212ef01ab329faf0bacc4 Mon Sep 17 00:00:00 2001
From: svs-odoo <svs@odoo.com>
Date: Tue, 2 Oct 2018 06:54:24 +0000
Subject: [PATCH] [IMP] web: reload currencies when activating one
Active currencies are given in session_info, in the page source.
When the user activated a new currency, he had to reload the page
to make the browser aware of that new currency (without reloading,
there was no currency symbol displayed next to the amounts).
This rev. forces a reload of the currencies each time a currency is
edited.
Task #1838654
closes odoo/odoo#31192
---
addons/web/static/src/js/core/session.js | 21 ++++++++++
.../static/src/js/views/basic/basic_model.js | 5 +++
addons/web/static/tests/views/form_tests.js | 41 +++++++++++++++++++
3 files changed, 67 insertions(+)
diff --git a/addons/web/static/src/js/core/session.js b/addons/web/static/src/js/core/session.js
index 7212b8ad76ed..14886591d7bc 100644
--- a/addons/web/static/src/js/core/session.js
+++ b/addons/web/static/src/js/core/session.js
@@ -336,6 +336,27 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
return -new Date(date).getTimezoneOffset();
},
+ //--------------------------------------------------------------------------
+ // Public
+ //--------------------------------------------------------------------------
+
+ /**
+ * Reload the currencies (initially given in session_info). This is meant to
+ * be called when changes are made on 'res.currency' records (e.g. when
+ * (de-)activating a currency). For the sake of simplicity, we reload all
+ * session_info.
+ *
+ * FIXME: this whole currencies handling should be moved out of session.
+ *
+ * @returns {$.promise}
+ */
+ reloadCurrencies: function () {
+ var self = this;
+ return this.rpc('/web/session/get_session_info').then(function (result) {
+ self.currencies = result.currencies;
+ });
+ },
+
//--------------------------------------------------------------------------
// Handlers
//--------------------------------------------------------------------------
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index 3e20035734d4..4d86ef4293bf 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -3477,6 +3477,8 @@ var BasicModel = AbstractModel.extend({
* Invalidates the DataManager's cache if the main model (i.e. the model of
* its root parent) of the given dataPoint is a model in 'noCacheModels'.
*
+ * Reloads the currencies if the main model is 'res.currency'.
+ *
* @private
* @param {Object} dataPoint
*/
@@ -3484,6 +3486,9 @@ var BasicModel = AbstractModel.extend({
while (dataPoint.parentID) {
dataPoint = this.localData[dataPoint.parentID];
}
+ if (dataPoint.model === 'res.currency') {
+ session.reloadCurrencies();
+ }
if (_.contains(this.noCacheModels, dataPoint.model)) {
core.bus.trigger('clear_cache');
}
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index a8dc874a5aea..b1df6260359b 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -7004,6 +7004,47 @@ QUnit.module('Views', {
testUtils.mock.unpatch(BasicModel);
});
+ QUnit.test('reload currencies when writing on records of model res.currency', function (assert) {
+ assert.expect(5);
+
+ this.data['res.currency'] = {
+ fields: {},
+ records: [{id: 1, display_name: "some currency"}],
+ };
+
+ var form = createView({
+ View: FormView,
+ model: 'res.currency',
+ data: this.data,
+ arch: '<form><field name="display_name"/></form>',
+ res_id: 1,
+ viewOptions: {
+ mode: 'edit',
+ },
+ mockRPC: function (route, args) {
+ assert.step(args.method);
+ return this._super.apply(this, arguments);
+ },
+ session: {
+ reloadCurrencies: function () {
+ assert.step('reload currencies');
+ },
+ },
+ });
+
+ testUtils.fields.editInput(form.$('.o_field_widget[name=display_name]'), 'new value');
+ testUtils.form.clickSave(form);
+
+ assert.verifySteps([
+ 'read',
+ 'write',
+ 'reload currencies',
+ 'read',
+ ]);
+
+ form.destroy();
+ });
+
QUnit.test('a popup window should automatically close after a do_action event', function (assert) {
// Having clicked on a one2many in a form view and clicked on a many2one
--
GitLab