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

[FIX] no superuser in view, todo: use frontend widget contact 

bzr revid: chm@openerp.com-20131115115513-jbvmt9wb7orndc8t
This commit is contained in:
Christophe Matthieu 2013-11-15 12:55:13 +01:00
parent 14edb56bb3
commit 162754294c
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/website_crm_partner_assign/controllers/main.py
View File

@ -38,19 +38,19 @@ class WebsiteCrmPartnerAssign(http.Controller):
# format pager
partner_ids = partner_obj.search(
request.cr, openerp.SUPERUSER_ID, partner_domain,
request.cr, request.uid, partner_domain,
context=request.context)
pager = request.website.pager(url="/partners/", total=len(partner_ids), page=page, step=self._references_per_page, scope=7, url_args=post)
# search for partners to display
partner_ids = partner_obj.search(
request.cr, openerp.SUPERUSER_ID, partner_domain,
request.cr, request.uid, partner_domain,
context=request.context,
limit=self._references_per_page, offset=pager['offset'],
order="grade_id ASC,partner_weight DESC")
google_map_partner_ids = ",".join([str(p) for p in partner_ids])
partners = partner_obj.browse(
request.cr, openerp.SUPERUSER_ID, partner_ids, request.context)
request.cr, request.uid, partner_ids, request.context)
# group by country
countries = partner_obj.read_group(
@ -94,7 +94,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
def partners_ref(self, partner_id=0, **post):
partner_obj = request.registry['res.partner']
if request.context['is_public_user']:
partner_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('website_published', '=', True), ('id', '=', partner_id)], context=request.context)
partner_ids = partner_obj.search(request.cr, request.uid, [('website_published', '=', True), ('id', '=', partner_id)], context=request.context)
else:
partner_ids = partner_obj.search(request.cr, request.uid, [('id', '=', partner_id)], context=request.context)
if not partner_ids:
@ -102,7 +102,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
values = {
'partner_id': partner_obj.browse(
request.cr, openerp.SUPERUSER_ID, partner_ids[0],
request.cr, request.uid, partner_ids[0],
context=dict(request.context, show_address=True)),
}
return request.website.render("website_crm_partner_assign.partner", values)

2
addons/website_customer/controllers/main.py
View File

@ -56,7 +56,7 @@ class WebsiteCustomer(http.Controller):
partner_ids = partner_obj.search(
cr, uid, domain,
limit=self._references_per_page, offset=pager['offset'], context=context)
partners = partner_obj.browse(request.cr, openerp.SUPERUSER_ID,
partners = partner_obj.browse(request.cr, request.uid,
partner_ids, request.context)
values = {

14
addons/website_event/views/website_event.xml
View File

@ -253,8 +253,8 @@
<a t-att-href="event_id.google_map_link()" target="_BLANK">
<img t-att-src="event_id.google_map_img()" width="100%%"/>
</a>
<address class="mt16 mb8">
<strong t-field="event_id.address_id.name"/>
<address class="mt16 mb8" t-field="event_id.address_id"> <!-- TODO: use widget contact -->
<!-- <strong t-field="event_id.address_id"/>
<p t-field="event_id.address_id"/>
<div t-if="event_id.address_id.phone">
<span class="icon-phone"/> <span t-field="event_id.address_id.phone"/>
@ -264,12 +264,12 @@
<a t-att-href="'mailto:'+event_id.address_id.email">
<span t-field="event_id.address_id.email"/>
</a>
</div>
</div> -->
</address>
</div>
</div>
<div class="panel panel-default" t-if="event_id.address_id">
<div class="panel panel-default">
<div class="panel-heading">
<h4>When</h4>
</div>
@ -283,14 +283,14 @@
<div class="panel-heading">
<h4>Organizer</h4>
</div>
<div class="panel-body">
<p><strong t-field="event_id.organizer_id.display_name"/></p>
<div class="panel-body" t-field="event_id.organizer_id"> <!-- TODO: use widget contact -->
<!-- <p><strong t-field="event_id.organizer_id.display_name"/></p>
<div t-if="event_id.phone">
<span class="icon-phone"/> <span t-field="event_id.phone"/>
</div>
<div t-if="event_id.email">
<i class="icon-envelope"/> <span t-field="event_id.email"/>
</div>
</div> -->
</div>
</div>