diff --git a/addons/website_contract/controllers/main.py b/addons/website_contract/controllers/main.py index 275fd21b952..fe7bb0f1f4a 100644 --- a/addons/website_contract/controllers/main.py +++ b/addons/website_contract/controllers/main.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +import openerp from openerp.addons.web import http from openerp.addons.web.http import request @@ -9,8 +10,11 @@ class website_contract(http.Controller): def blog(self, **post): website = request.registry['website'] partner_obj = request.registry['res.partner'] - project_ids = partner_obj.search(request.cr, request.uid, [(1, "=", 1)]) + project_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('website_testimonial', "!=", False), ('website_published', '=', True)]) + if request.uid != website.get_public_user().id: + project_ids += partner_obj.search(request.cr, request.uid, [(1, "=", 1)]) + project_ids = list(set(project_ids)) values = website.get_rendering_context({ - 'partner_ids': partner_obj.browse(request.cr, request.uid, project_ids) + 'partner_ids': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, project_ids) }) return website.render("website_contract.index", values) diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml index 4b84542399e..3ec536d3677 100644 --- a/addons/website_contract/views/website_contract.xml +++ b/addons/website_contract/views/website_contract.xml @@ -17,14 +17,16 @@ References
-
-
+
+
+
+
                             
diff --git a/addons/website_contract/website_contract.py b/addons/website_contract/website_contract.py index d8c372ee4aa..10da628e747 100644 --- a/addons/website_contract/website_contract.py +++ b/addons/website_contract/website_contract.py @@ -5,5 +5,10 @@ from openerp.osv import osv, fields class hr(osv.osv): _inherit = 'res.partner' + _columns = { + 'website_published': fields.boolean('Available in the website'), + 'website_testimonial': fields.text('Recommandation'), + } + def img(self, cr, uid, ids, field='image_small', context=None): return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0])