diff options
| author | Jérome Maes <jem@openerp.com> | 2015-06-01 16:37:07 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-09-01 20:16:08 +0200 |
| commit | 4af96310721237d3640bbd162ff9ea84e627028d (patch) | |
| tree | 2deb74fa477c9ea33b1a0a65199b96e2d6e5f02b /addons/bus/controllers | |
| parent | 5907be1f335dc21934619a34fc928a19e7885211 (diff) | |
[MOV] mail, im_chat : move files and code from im_chat to mail and bus
- im_chat.session will be replaced by mail.channel
- im_chat.shortode is renamed into mail.shortcode
- im_chat.presence is moved to bus module
- js and controller code is moved from im_chat to mail module
This commit only move files, and modify manifests, bundles, ... The code will be adapt in the next commits.
Diffstat (limited to 'addons/bus/controllers')
| -rw-r--r-- | addons/bus/controllers/main.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/bus/controllers/main.py b/addons/bus/controllers/main.py index ee9902ec983..3da386e80b2 100644 --- a/addons/bus/controllers/main.py +++ b/addons/bus/controllers/main.py @@ -20,6 +20,9 @@ class BusController(openerp.http.Controller): # override to add channels def _poll(self, dbname, channels, last, options): + # update the user presence + if request.session.uid and 'im_presence' in options: + request.env['bus.presence'].update(options.get('im_presence')) request.cr.close() request._cr = None return dispatch.poll(dbname, channels, last) |