[FIX]website_customer, website_crm_partner_assign: keep search if jump between countries, and keep countries if do a new search.

bzr revid: dle@openerp.com-20140130193706-xxn668p2edr69zue

4 files changed, 12 insertions, 7 deletions

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index da05075445a..17a666cf2e3 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -1,14 +1,12 @@
 # -*- coding: utf-8 -*-
 
-import werkzeug.urls
-
 import openerp
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.tools.translate import _
 from openerp.addons.web.http import request
 from openerp.addons.website_partner.controllers import main as website_partner
-
+import werkzeug.urls
 
 class WebsiteCrmPartnerAssign(http.Controller):
     _references_per_page = 20
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index a0082fb929c..9906eaf87c6 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -55,7 +55,7 @@
                         <t t-call="website.pager">
                            <t t-set="classname">pull-left</t>
                         </t>
-                        <form action="#{ country_dict['country_id'][0] and '/partners/country/%s' % slug(country_dict['country_id']) or '/partners/' }" method="get" class="navbar-search pull-right pagination form-inline">
+                        <form action="" method="get" class="navbar-search pull-right pagination form-inline">
                             <div class="form-group">
                                 <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
                             </div>
diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index 9e026c135a2..2ee5e446c5d 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -8,7 +8,6 @@ from openerp.addons.web.http import request
 from openerp.addons.website_partner.controllers import main as website_partner
 import werkzeug.urls
 
-
 class WebsiteCustomer(http.Controller):
     _references_per_page = 20
 
@@ -22,6 +21,7 @@ class WebsiteCustomer(http.Controller):
     ], type='http', auth="public", website=True, multilang=True)
     def customers(self, country_id=0, page=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
+        country_obj = request.registry['res.country']
         partner_obj = request.registry['res.partner']
         partner_name = post.get('search', '')
 
@@ -47,6 +47,13 @@ class WebsiteCustomer(http.Controller):
 
         if country_id:
             domain += [('country_id', '=', country_id)]
+            if not any(x['country_id'][0] == country_id for x in countries):
+                country = country_obj.browse(cr, uid, country_id, context)
+                countries.append({
+                    'country_id_count': 0,
+                    'country_id': (country_id, country.name)
+                })
+                countries.sort(key=lambda d: d['country_id'][1])
 
         # search customers to display
         partner_ids = partner_obj.search(cr, openerp.SUPERUSER_ID, domain, context=request.context)
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index 97b6fa29f80..d58e3dfa262 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -30,7 +30,7 @@
                             <t t-call="website.pager">
                                <t t-set="classname" t-value="'pull-left'"/>
                             </t>
-                            <form action="/customers/" method="get" class="navbar-search pull-right pagination form-inline">
+                            <form action="" method="get" class="navbar-search pull-right pagination form-inline">
                                 <div class="form-group">
                                     <input type="text" name="search" class="search-query form-control"
                                         placeholder="Search" t-att-value="post.get('search', '')"/>
@@ -82,7 +82,7 @@
                 <t t-if="country_dict['country_id']">
                     <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
                         <a t-attf-href="/customers/#{ country_dict['country_id'][0] and 'country/%s/' % slug(country_dict['country_id']) or '' }#{ search_path }">
-                            <span class="badge pull-right" t-esc="country_dict['country_id_count'] or ''"/>
+                            <span class="badge pull-right" t-esc="country_dict['country_id_count'] or '0'"/>
                             <t t-esc="country_dict['country_id'][1]"/>
                         </a>
                     </li>