odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Some minor improvements 

bzr revid: nicolas.vanhoren@openerp.com-20121204145756-pxzhvjjmvb21yegw
This commit is contained in:
niv-openerp 2012-12-04 15:57:56 +01:00
parent 7ad062ca39
commit 7d52b3dbbf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/web_im/im.py
View File

@ -149,7 +149,7 @@ class im_message(osv.osv):
}
_defaults = {
'date': datetime.datetime.now(),
'date': datetime.datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
}
def get_messages(self, cr, uid, last=None, users_watch=None, context=None):
@ -188,9 +188,10 @@ class res_user(osv.osv):
res = {}
current = datetime.datetime.now()
delta = datetime.timedelta(0, DISCONNECTION_TIMER)
for obj in self.browse(cr, uid, ids, context=context):
last_update = datetime.datetime.strptime(obj.im_last_status_update, DEFAULT_SERVER_DATETIME_FORMAT)
res[obj.id] = obj.im_last_status and (last_update + delta) > current
data = self.read(cr, uid, ids, ["im_last_status_update", "im_last_status"], context=context)
for obj in data:
last_update = datetime.datetime.strptime(obj["im_last_status_update"], DEFAULT_SERVER_DATETIME_FORMAT)
res[obj["id"]] = obj["im_last_status"] and (last_update + delta) > current
return res
def im_connect(self, cr, uid, context=None):