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

[IMP]Improved code. 

bzr revid: bth@tinyerp.com-20131114125056-8j5icmocoe61jftl
This commit is contained in:
bth-openerp 2013-11-14 18:20:56 +05:30
parent e225790756
commit 66c590aa29
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,19 +50,20 @@ class WebsiteCrmPartnerAssign(http.Controller):
order="grade_id ASC,partner_weight DESC")
google_map_partner_ids = ",".join([str(p) for p in partner_ids])
where = 'r.is_company = True'
where = "r.is_company = True"
if request.context['is_public_user']:
where += ' and r.website_published = True'
where += " and r.website_published = True"
if grade_id and grade_id != "all":
where += ' and r.grade_id = '+str(grade_id) # try/catch int
where += " and r.grade_id = "+str(grade_id) # try/catch int
if country_id:
country = country_obj.browse(request.cr, request.uid, country_id, request.context)
where += ' and r.country_id = '+str(country_id)
where += " and r.country_id = "+str(country_id)
if post_name:
where += " or r.name ilike '"+post_name+"' or r.website_description ilike '"+post_name+"'"
query = 'select r.id from res_partner r, res_partner_grade g where r.grade_id=g.id and '+ where + ' order by g.sequence DESC limit %s offset %s'
request.cr.execute(query, (self._references_per_page, pager['offset']))
search_partner_ids = [x[0] for x in request.cr.fetchall()]
where += " or r.name ilike '%%%s%%'" % post_name + " or r.website_description ilike '%%%s%%'" % post_name
query = 'select r.id from res_partner r, res_partner_grade g where r.grade_id=g.id and '+ where+ ' order by g.sequence DESC limit '+ str(self._references_per_page)+ ' offset '+ str(pager['offset'])
request.cr.execute(query)
partnerres = request.cr.fetchall()
search_partner_ids = [x[0] for x in partnerres]
partners = partner_obj.browse(
request.cr, openerp.SUPERUSER_ID, search_partner_ids, request.context)

13
addons/website_membership/controllers/main.py
View File

@ -35,21 +35,22 @@ class WebsiteMembership(http.Controller):
base_line_domain += [('membership_id', '=', membership_id)]
membership = product_obj.browse(cr, openerp.SUPERUSER_ID, membership_id, context=context)
else:
membership = ''
membership = None
if post_name:
base_line_domain += ['|', ('partner.name', 'ilike', "%%%s%%" % post_name), ('partner.website_description', 'ilike', "%%%s%%" % post_name)]
if request.context['is_public_user']:
where = 'partner.website_published = True'
where = "r.website_published = True"
else:
where = '1 = 1'
where = "1 = 1"
if membership_id:
where += ' and membership_id = '+ membership_id
where += " and m.membership_id = "+ membership_id
membership = product_obj.browse(cr, openerp.SUPERUSER_ID, membership_id, context=context)
else:
membership = ''
membership = None
if post_name:
where += " or partner.name ilike '" + post_name + "' partner.website_description ilike '" + post_name +"'"
where += " or r.name ilike '%%%s%%'" % post_name + " or r.website_description ilike '%%%s%%'" % post_name
query = 'select m.id, p.name_template, m.membership_id, m.partner, r.name, r.parent_id, r.website_short_description, r.image_small from membership_membership_line m, product_product p, res_partner r where m.membership_id=p.id and m.partner=r.id and '+ where + ' order by m.membership_id, m.member_price DESC'
cr.execute(query)
search_membership_ids = [x[0] for x in cr.fetchall()]