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

[FIX] Fixed json encoding problem for chat login. 

bzr revid: noz@tinyerp.com-20110413052633-7ql0mcdgxcpc88hl
This commit is contained in:
noz (OpenERP) 2011-04-13 10:56:33 +05:30
parent 4113406d05
commit d3b56fdd3e
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/base/static/src/base.html
View File

@ -38,10 +38,10 @@
<script type="text/javascript" src="/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js"></script>
<script type="text/javascript" src="/base_calendar/static/src/js/calendar.js"></script>
<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js"></script>
<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jstore-all-min.js"></script>
<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.md5.js"></script>
<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/im.js"></script>
<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js"></script>
<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.jstore-all-min.js"></script>
<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/jquery.md5.js"></script>
<script type="text/javascript" src="/web_chat/static/lib/AjaxIM/js/im.js"></script>
<link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" />
<link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui.notify/css/ui.notify.css" />

13
addons/web_chat/controllers/main.py
View File

@ -87,14 +87,11 @@ class PollServer(openerpweb.Controller):
# Temporary Guest1 is my current user
req.applicationsession['current_user'] = 'Guest1'
return """
{
"r":"logged in",
"u":'Guest1',
"s":"f9e1811536f19ad5b9e00376f9ff1532",
"f":""" + str(mq.userlist(req)) + """
}
"""
return simplejson.dumps({'r': 'logged in', 'u': 'Guest1', 's': 'f9e1811536f19ad5b9e00376f9ff1532',
'f': [{'u': 'Guest1', 's':{'s':1, 'm':'111'}, 'g':'Users'},
{'u': 'Guest2', 's':{'s':1, 'm':'222'}, 'g':'Users'},
{'u': 'Guest3', 's':{'s':1, 'm':'333'}, 'g':'Users'}]})
@openerpweb.httprequest
def logout(self, req):