[MIG] bus, im_chat, im_livechat, website_livechat : migration to new API.

Migrate the models and controller to new API. Renaming xml id according to convention, renaming openerp tag into odoo tag. Add comment strings and documentations.

3 files changed, 13 insertions, 10 deletions

diff --git a/addons/website_livechat/models/__init__.py b/addons/website_livechat/models/__init__.py
index 2f372141da0..87c8e105bca 100644
--- a/addons/website_livechat/models/__init__.py
+++ b/addons/website_livechat/models/__init__.py
@@ -1,2 +1,3 @@
-import website
+# -*- coding: utf-8 -*-
 import im_livechat
+import website
diff --git a/addons/website_livechat/models/im_livechat.py b/addons/website_livechat/models/im_livechat.py
index f294869a23b..fb4e58cda49 100644
--- a/addons/website_livechat/models/im_livechat.py
+++ b/addons/website_livechat/models/im_livechat.py
@@ -3,7 +3,8 @@ from openerp import api, models, fields
 from openerp.addons.website.models.website import slug
 
 
-class im_livechat_channel(models.Model):
+class ImLivechatChannel(models.Model):
+
     _name = 'im_livechat.channel'
     _inherit = ['im_livechat.channel', 'website.published.mixin']
 
diff --git a/addons/website_livechat/models/website.py b/addons/website_livechat/models/website.py
index 0bda152772c..d1892d739de 100644
--- a/addons/website_livechat/models/website.py
+++ b/addons/website_livechat/models/website.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 from openerp.osv import osv
-from openerp import api, fields, models, SUPERUSER_ID
+from openerp import api, fields, models
 from openerp.http import request
 
-class website(models.Model):
+class Website(models.Model):
 
     _inherit = "website"
 
     channel_id = fields.Many2one('im_livechat.channel', string='Live Chat Channel')
 
 
-class website_config_settings(models.TransientModel):
+class WebsiteConfigSettings(models.TransientModel):
 
     _inherit = 'website.config.settings'
 
@@ -18,15 +18,16 @@ class website_config_settings(models.TransientModel):
 
 
 
-class ir_ui_view(osv.Model):
+class IrUiView(models.Model):
 
     _inherit = "ir.ui.view"
 
-    def _prepare_qcontext(self, cr, uid, context=None):
-        qcontext = super(ir_ui_view, self)._prepare_qcontext(cr, uid, context=context)
+    @api.model
+    def _prepare_qcontext(self):
+        qcontext = super(IrUiView, self)._prepare_qcontext()
         if request and getattr(request, 'website_enabled', False):
             if request.website.channel_id:
-                qcontext['website_livechat_url'] = self.pool.get('ir.config_parameter').get_param(cr, SUPERUSER_ID, 'web.base.url')
-                qcontext['website_livechat_dbname'] = cr.dbname
+                qcontext['website_livechat_url'] = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+                qcontext['website_livechat_dbname'] = self._cr.dbname
                 qcontext['website_livechat_channel'] = request.website.channel_id.id
         return qcontext