[FIX] website_crm_partner_assign: clean and fix routes, pager, and grade / country...

Routes were still using an old int / str way of matching parameters. They have been
converted into model-based routes. Also cleaned the way grades and countries are
managed and displayed. Pager is now working, taking into account grade and country.

diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 486d10e..c9621b7 100644 (file)
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -6,97 +6,111 @@ import werkzeug
 from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
+from openerp.addons.website.models.website import slug
 from openerp.tools.translate import _
 
+
 class WebsiteCrmPartnerAssign(http.Controller):
-    _references_per_page = 20
+    _references_per_page = 40
 
     @http.route([
         '/partners',
         '/partners/page/<int:page>',
 
-        '/partners/grade/<int:grade_id>',
-        '/partners/grade/<int:grade_id>/page/<int:page>',
-
-        '/partners/country/<int:country_id>',
-        '/partners/country/<country_name>-<int:country_id>',
-        '/partners/country/<int:country_id>/page/<int:page>',
-        '/partners/country/<country_name>-<int:country_id>/page/<int:page>',
+        '/partners/grade/<model("res.partner.grade"):grade>',
+        '/partners/grade/<model("res.partner.grade"):grade>/page/<int:page>',
 
-        '/partners/grade/<int:grade_id>/country/<int:country_id>',
-        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>',
-        '/partners/grade/<int:grade_id>/country/<int:country_id>/page/<int:page>',
-        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>/page/<int:page>',
+        '/partners/country/<model("res.country"):country>',
+        '/partners/country/<model("res.country"):country>/page/<int:page>',
 
+        '/partners/grade/<model("res.partner.grade"):grade>/country/<model("res.country"):country>',
+        '/partners/grade/<model("res.partner.grade"):grade>/country/<model("res.country"):country>/page/<int:page>',
     ], type='http', auth="public", website=True, multilang=True)
-    def partners(self, country_id=0, grade_id=0, page=0, country_name='', **post):
-        country_obj = request.registry['res.country']
+    def partners(self, country=None, grade=None, page=0, **post):
         partner_obj = request.registry['res.partner']
-        post_name = post.get('search', '')
-        country = None
+        search = post.get('search', '')
 
-        # format displayed membership lines domain
         base_partner_domain = [('is_company', '=', True), ('grade_id.website_published', '=', True), ('website_published', '=', True)]
-        partner_domain = list(base_partner_domain)
-        if post_name:
-            partner_domain += ['|', ('name', 'ilike', post_name), ('website_description', 'ilike', post_name)]
-        if grade_id and grade_id != "all":
-            partner_domain += [('grade_id', '=', int(grade_id))]  # try/catch int
+        if search:
+            base_partner_domain += ['|', ('name', 'ilike', search), ('website_description', 'ilike', search)]
+
+        # group by grade
+        grade_domain = list(base_partner_domain)
+        if country:
+            grade_domain += [('country_id', '=', country.id)]
+        grades = partner_obj.read_group(
+            request.cr, SUPERUSER_ID, grade_domain, ["id", "grade_id"],
+            groupby="grade_id", orderby="grade_id DESC", context=request.context)
+        grades_partners = partner_obj.search(
+            request.cr, SUPERUSER_ID, grade_domain,
+            context=request.context, count=True)
+        # flag active grade
+        for grade_dict in grades:
+            grade_dict['active'] = grade and grade_dict['grade_id'][0] == grade.id
+        grades.insert(0, {
+            'grade_id_count': grades_partners,
+            'grade_id': (0, _("All Categories")),
+            'active': bool(grade is None),
+        })
 
         # group by country
+        country_domain = list(base_partner_domain)
+        if grade:
+            country_domain += [('grade_id', '=', grade.id)]
         countries = partner_obj.read_group(
-            request.cr, SUPERUSER_ID, partner_domain, ["id", "country_id"],
+            request.cr, SUPERUSER_ID, country_domain, ["id", "country_id"],
             groupby="country_id", orderby="country_id", context=request.context)
         countries_partners = partner_obj.search(
-            request.cr, SUPERUSER_ID, partner_domain,
+            request.cr, SUPERUSER_ID, country_domain,
             context=request.context, count=True)
-
-        if country_id:
-            country = country_obj.browse(request.cr, request.uid, country_id, request.context)
-            partner_domain += [('country_id', '=', country_id)]
-            if not any(x['country_id'][0] == country_id for x in countries):
-                countries.append({
-                    'country_id_count': 0,
-                    'country_id': (country_id, country.name)
-                })
-                countries.sort(key=lambda d: d['country_id'][1])
-
+        # flag active country
+        for country_dict in countries:
+            country_dict['active'] = country and country_dict['country_id'][0] == country.id
         countries.insert(0, {
             'country_id_count': countries_partners,
-            'country_id': (0, _("All Countries"))
+            'country_id': (0, _("All Countries")),
+            'active': bool(country is None),
         })
 
+        # current search
+        if grade:
+            base_partner_domain += [('grade_id', '=', grade.id)]
+        if country:
+            base_partner_domain += [('country_id', '=', country.id)]
+
         # format pager
+        if grade and not country:
+            url = '/partners/grade/' + slug(grade)
+        elif country and not grade:
+            url = '/partners/country/' + slug(country)
+        elif country and grade:
+            url = '/partners/grade/' + slug(grade) + '/country/' + slug(country)
+        else:
+            url = '/partners'
+        url_args = {}
+        if search:
+            url_args['search'] = search
         partner_count = partner_obj.search_count(
-            request.cr, SUPERUSER_ID, partner_domain,
+            request.cr, SUPERUSER_ID, base_partner_domain,
             context=request.context)
-        pager = request.website.pager(url="/partners", total=partner_count, page=page, step=self._references_per_page, scope=7, url_args=post)
+        pager = request.website.pager(
+            url=url, total=partner_count, page=page, step=self._references_per_page, scope=7,
+            url_args=url_args)
 
-        partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, partner_domain,
-                                         offset=pager['offset'], limit=self._references_per_page,
-                                         order="grade_id DESC, partner_weight DESC",
-                                         context=request.context)
+        # search partners matching current search parameters
+        partner_ids = partner_obj.search(
+            request.cr, SUPERUSER_ID, base_partner_domain,
+            offset=pager['offset'], limit=self._references_per_page,
+            order="grade_id DESC, partner_weight DESC",
+            context=request.context)
         google_map_partner_ids = ','.join(map(str, partner_ids))
         partners = partner_obj.browse(request.cr, SUPERUSER_ID, partner_ids, request.context)
 
-        # group by grade
-        grades = partner_obj.read_group(
-            request.cr, SUPERUSER_ID, base_partner_domain, ["id", "grade_id"],
-            groupby="grade_id", orderby="grade_id DESC", context=request.context)
-        grades_partners = partner_obj.search(
-            request.cr, SUPERUSER_ID, base_partner_domain,
-            context=request.context, count=True)
-        grades.insert(0, {
-            'grade_id_count': grades_partners,
-            'grade_id': (0, _("All Categories"))
-        })
-
         values = {
             'countries': countries,
-            'current_country_id': country_id,
             'current_country': country,
             'grades': grades,
-            'grade_id': grade_id,
+            'current_grade': grade,
             'partners': partners,
             'google_map_partner_ids': google_map_partner_ids,
             'pager': pager,

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 3e96bc1..b43f7c1 100644 (file)
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -36,13 +36,13 @@
                 </h2>
             </div>
 
-            <div class="col-md-4 mb32" id="partner_left">
+            <div class="col-md-3 mb32" id="partner_left">
 
-                <ul class="nav nav-pills nav-stacked mt16">
-                    <li class="nav-header"><h3>Categories</h3></li>
+                <ul id="reseller_grades" class="nav nav-pills nav-stacked mt16">
+                    <li class="nav-header"><h3>Filter by Grade</h3></li>
                     <t t-foreach="grades" t-as="grade">
-                        <li t-if="grade['grade_id']" t-att-class="grade['grade_id'][0] == grade_id and 'active' or ''">
-                            <a t-attf-href="#{ grade['grade_id'][0] and '/partners/grade/%s' % grade['grade_id'][0] or '/partners' }#{ current_country_id and ('/country/%s' % current_country_id) or '' }#{ search_path }">
+                        <li t-att-class="grade['active'] and 'active' or ''">
+                            <a t-attf-href="/partners/#{ grade['grade_id'][0] and 'grade/%s/' % grade['grade_id'][0] or '' }#{ current_country and 'country/%s/' % slug(current_country) or '' }#{ search_path }">
                                 <span class="badge pull-right" t-esc="grade['grade_id_count'] or ''"/>
                                 <t t-esc="grade['grade_id'][1]"/> 
                             </a>
@@ -51,34 +51,26 @@
                 </ul>
 
                 <ul id="reseller_countries" class="nav nav-pills nav-stacked mt16">
-                    <li class="nav-header"><h3>Locations</h3></li>
-                    <t t-foreach="countries" t-as="country_dict">
-                        <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="#{ country_dict['country_id'][0] and ('/partners/country/%s' % slug(country_dict['country_id'])) or '/partners' }#{ search_path }">
-                                    <span class="badge pull-right" t-esc="country_dict['country_id_count'] or ''"/>
-                                    <t t-esc="country_dict['country_id'][1]"/> 
-                                </a>
-                            </li>
-                        </t>
+                    <li class="nav-header"><h3>Filter by Country</h3></li>
+                    <t t-foreach="countries" t-as="country">
+                        <li t-att-class="country['active'] and 'active' or ''">
+                            <a t-attf-href="/partners/#{ current_grade and 'grade/%s/' % slug(current_grade) or ''}#{country['country_id'][0] and 'country/%s/' % country['country_id'][0] or '' }#{ search_path }">
+                                <span class="badge pull-right" t-esc="country['country_id_count'] or ''"/>
+                                <t t-esc="country['country_id'][1]"/> 
+                            </a>
+                        </li>
                     </t>
                 </ul>
 
             </div>
             
-            <div class="col-md-8" id="ref_content">
-                <div class='navbar'>
-                    <div>
-                        <t t-call="website.pager">
-                           <t t-set="classname">pull-left</t>
-                        </t>
-                        <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>
-
-                        </form>
-                    </div>
+            <div class="col-md-9" id="ref_content">
+                <div class="pull-right">
+                    <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>
+                    </form>
                 </div>
                 <div>
                     <p t-if="not partners">No result found</p>
@@ -94,7 +86,7 @@
                                t-field="partner.image_small"
                                t-field-options='{"widget": "image", "class": "media-object"}'
                             ></a>
-                            <div class="media-body" style="min-height: 64px;">
+                            <div class="media-body o_partner_body" style="min-height: 64px;">
                                 <a class="media-heading" t-attf-href="/partners/#{slug(partner)}">
                                     <span t-field="partner.display_name"/>
                                 </a>
@@ -102,7 +94,11 @@
                             </div>
                         </div>
                     </t>
-
+                </div>
+                <div class='navbar'>
+                    <t t-call="website.pager">
+                       <t t-set="classname">pull-left</t>
+                    </t>
                 </div>
             </div>
         </t>
@@ -113,8 +109,8 @@
     <xpath expr="//ul[@id='reseller_countries']" position="after">
         <h3>World Map</h3>
         <ul class="nav">
-            <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners"
-                style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
+            <iframe t-attf-src="/google_map/?width=260&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners"
+                style="width:260px; height:260px; border:0; padding:0; margin:0;"></iframe>
         </ul>
     </xpath>
 </template>