diff options
Diffstat (limited to 'addons/website_contract/controllers/main.py')
| -rw-r--r-- | addons/website_contract/controllers/main.py | 66 |
1 files changed, 44 insertions, 22 deletions
diff --git a/addons/website_contract/controllers/main.py b/addons/website_contract/controllers/main.py index c911881e2fd..da22ad3437e 100644 --- a/addons/website_contract/controllers/main.py +++ b/addons/website_contract/controllers/main.py @@ -17,42 +17,58 @@ class website_contract(http.Controller): # check contracts contract_ids = account_obj.search(request.cr, openerp.SUPERUSER_ID, [(1, "=", 1)]) - contract_project_ids = [contract.partner_id.id - for contract in account_obj.browse(request.cr, openerp.SUPERUSER_ID, contract_ids) if contract.partner_id] + contracts = account_obj.browse(request.cr, openerp.SUPERUSER_ID, + contract_ids, request.context) + contract_project_ids = [contract.partner_id.id for contract in contracts + if contract.partner_id] domain = ['|', ('id', "in", contract_project_ids), ('id', "child_of", contract_project_ids)] if post.get('search'): domain += ['|', - ('name', 'ilike', "%%%s%%" % post.get("search")), + ('name', 'ilike', "%%%s%%" % post.get("search")), ('website_description', 'ilike', "%%%s%%" % post.get("search"))] - # public partner profile - partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, domain + [('website_published', '=', True)]) + partner_ids = partner_obj.search( + request.cr, openerp.SUPERUSER_ID, + domain + [('website_published', '=', True)], request.context) google_map_partner_ids = ",".join([str(p) for p in partner_ids]) if not request.webcontext.is_public_user: # search without website_published - partner_ids += partner_obj.search(request.cr, request.uid, domain) + partner_ids += partner_obj.search(request.cr, request.uid, + domain, context=request.context) partner_ids = list(set(partner_ids)) - # group by country - countries = partner_obj.read_group(request.cr, request.uid, domain, ["id", "country_id"], groupby="country_id", orderby="country_id") - countries.insert(0, {'country_id_count': partner_obj.search(request.cr, request.uid, domain, count=True), 'country_id': ("all", _("All Countries"))}) - + countries = partner_obj.read_group( + request.cr, request.uid, domain, ["id", "country_id"], + groupby="country_id", orderby="country_id", context=request.context) + country_count = partner_obj.search( + request.cr, request.uid, domain, count=True, context=request.context) + countries.insert(0, { + 'country_id_count': country_count, + 'country_id': ("all", _("All Countries")) + }, context=request.context) if post.get("country", "all") != 'all': - partner_ids = partner_obj.search(request.cr, request.uid, [('id', 'in', partner_ids), ('country_id', '=', int(post.get('country')))]) - + partner_ids = partner_obj.search( + request.cr, request.uid, + [ + ('id', 'in', partner_ids), + ('country_id', '=', int(post.get('country'))) + ], context=request.context) step = 20 pager = website.pager(url="/references/", total=len(partner_ids), page=page, step=step, scope=7, url_args=post) - partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('id', 'in', partner_ids)], limit=step, offset=pager['offset']) - + partner_ids = partner_obj.search( + request.cr, openerp.SUPERUSER_ID, [('id', 'in', partner_ids)], + limit=step, offset=pager['offset'], context=request.context) + partners = partner_obj.browse(request.cr, openerp.SUPERUSER_ID, + partner_ids, request.context) values = { 'countries': countries, - 'partner_ids': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids), + 'partner_ids': partners, 'google_map_partner_ids': google_map_partner_ids, 'pager': pager, 'searches': post, @@ -63,11 +79,17 @@ class website_contract(http.Controller): @website.route(['/references/<int:ref_id>/'], type='http', auth="public") def references_ref(self, ref_id=0, **post): partner_obj = request.registry['res.partner'] - partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('website_published', '=', True), ('id', '=', ref_id)]) + partner_ids = partner_obj.search( + request.cr, openerp.SUPERUSER_ID, [ + ('website_published', '=', True), + ('id', '=', ref_id) + ], context=request.context) if not request.webcontext.is_public_user: - partner_ids += partner_obj.search(request.cr, request.uid, [('id', '=', ref_id)]) - - values = { - 'partner_id': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, partner_ids[0], context={'show_address': True}), - } - return request.webcontext.render("website_contract.details", values) + partner_ids += partner_obj.search( + request.cr, request.uid, [('id', '=', ref_id)], + context=request.context) + + request.webcontext['partner_id'] = partner_obj.browse( + request.cr, openerp.SUPERUSER_ID, partner_ids[0], + dict(request.context + {'show_address': True})) + return request.webcontext.render("website_contract.details") |