From df04910d2af088a8bb2bd0ea9080494124b1753c Mon Sep 17 00:00:00 2001 From: Martin Geubelle Date: Tue, 26 Sep 2017 17:23:39 +0200 Subject: [PATCH] [FIX] *: correctly use `session` Widget has no attribute `session` since the new views. One should either use `getSession()` or require `web.session` (both cases are correct). --- addons/hr_attendance/static/src/js/greeting_message.js | 2 +- addons/hr_attendance/static/src/js/kiosk_confirm.js | 2 +- addons/point_of_sale/static/src/js/chrome.js | 2 +- addons/web/static/src/js/chrome/abstract_web_client.js | 2 +- addons/web/static/src/js/chrome/action_manager.js | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/hr_attendance/static/src/js/greeting_message.js b/addons/hr_attendance/static/src/js/greeting_message.js index 08c6879e077..ac6e3f86c73 100644 --- a/addons/hr_attendance/static/src/js/greeting_message.js +++ b/addons/hr_attendance/static/src/js/greeting_message.js @@ -23,7 +23,7 @@ var GreetingMessage = Widget.extend({ // to the (likely) appropriate menu, according to the user access rights if(!action.attendance) { this.activeBarcode = false; - this.session.user_has_group('hr_attendance.group_hr_attendance_user').then(function(has_group) { + this.getSession().user_has_group('hr_attendance.group_hr_attendance_user').then(function(has_group) { if(has_group) { self.next_action = 'hr_attendance.hr_attendance_action_kiosk_mode'; } else { diff --git a/addons/hr_attendance/static/src/js/kiosk_confirm.js b/addons/hr_attendance/static/src/js/kiosk_confirm.js index b489102fe68..2f55edd42c1 100644 --- a/addons/hr_attendance/static/src/js/kiosk_confirm.js +++ b/addons/hr_attendance/static/src/js/kiosk_confirm.js @@ -67,7 +67,7 @@ var KioskConfirm = Widget.extend({ start: function () { var self = this; - self.session.user_has_group('hr_attendance.group_hr_attendance_use_pin').then(function(has_group){ + this.getSession().user_has_group('hr_attendance.group_hr_attendance_use_pin').then(function(has_group){ self.use_pin = has_group; self.$el.html(QWeb.render("HrAttendanceKioskConfirm", {widget: self})); self.start_clock(); diff --git a/addons/point_of_sale/static/src/js/chrome.js b/addons/point_of_sale/static/src/js/chrome.js index d2de6db508d..3d95e3351a6 100644 --- a/addons/point_of_sale/static/src/js/chrome.js +++ b/addons/point_of_sale/static/src/js/chrome.js @@ -572,7 +572,7 @@ var Chrome = PosBaseWidget.extend({ this.started = new $.Deferred(); // resolves when DOM is online this.ready = new $.Deferred(); // resolves when the whole GUI has been loaded - this.pos = new models.PosModel(this.session,{chrome:this}); + this.pos = new models.PosModel(this.getSession(), {chrome:this}); this.gui = new gui.Gui({pos: this.pos, chrome: this}); this.chrome = this; // So that chrome's childs have chrome set automatically this.pos.gui = this.gui; diff --git a/addons/web/static/src/js/chrome/abstract_web_client.js b/addons/web/static/src/js/chrome/abstract_web_client.js index 9efb2a3c937..919473dd639 100644 --- a/addons/web/static/src/js/chrome/abstract_web_client.js +++ b/addons/web/static/src/js/chrome/abstract_web_client.js @@ -237,7 +237,7 @@ var AbstractWebClient = Widget.extend(mixins.ServiceProvider, { }, do_reload: function () { var self = this; - return this.session.session_reload().then(function () { + return session.session_reload().then(function () { session.load_modules(true).then( self.menu.proxy('do_reload')); }); diff --git a/addons/web/static/src/js/chrome/action_manager.js b/addons/web/static/src/js/chrome/action_manager.js index 4dfc299e428..8b88ee0c54f 100644 --- a/addons/web/static/src/js/chrome/action_manager.js +++ b/addons/web/static/src/js/chrome/action_manager.js @@ -895,14 +895,14 @@ var ActionManager = Widget.extend({ action: JSON.stringify(action), token: new Date().getTime() }; - var url = self.session.url('/web/report', params); + var url = session.url('/web/report', params); framework.unblockUI(); $('')[0].click(); return; } var c = crash_manager; return $.Deferred(function (d) { - self.session.get_file({ + session.get_file({ url: '/web/report', data: {action: JSON.stringify(action)}, complete: framework.unblockUI,