[ADD] Added website osv object + refactoring

[odoo/odoo.git] / addons / website_crm / controllers / main.py

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 37e921b..83613e1 100644 (file)
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import openerp
 from openerp.addons.web import http
 from openerp.addons.web.http import request
-from openerp.addons.website.controllers.main import template_values
 
 from urllib import quote_plus
 
@@ -11,16 +9,14 @@ class contactus(http.Controller):
 
     @http.route(['/crm/contactus'], type='http', auth="admin")
     def contactus(self, *arg, **post):
+        website = request.registry['website']
         post['user_id'] = False
         request.registry['crm.lead'].create(request.cr, request.uid, post)
-        values = template_values()
-        company = request.registry['res.company'].browse(request.cr, request.uid, 1)
+        values = website.get_rendering_context()
+        company = values['res_company']
         values.update({
-            'res_company': company,
             'google_map_url': "http://maps.googleapis.com/maps/api/staticmap?center=%s&sensor=false&zoom=8&size=298x298" % quote_plus('%s, %s %s, %s' % (company.street, company.city, company.zip, company.country_id and company.country_id.name_get()[0][1] or ''))
         })
-        html = request.registry.get("ir.ui.view").render(request.cr, request.uid, "website_crm.thanks", values)
-        return html
-
+        return website.render("website_crm.thanks", values)
 
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: