[FIX] website: route and redirect: remove all backslash from url

bzr revid: chm@openerp.com-20140314162346-25vohj6ayp65tgiy

2 files changed, 14 insertions, 14 deletions

diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index 173b0871dbe..5f0825e132c 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -12,12 +12,12 @@ class WebsiteCustomer(http.Controller):
     _references_per_page = 20
 
     @http.route([
-        '/customers/',
-        '/customers/page/<int:page>/',
+        '/customers',
+        '/customers/page/<int:page>',
         '/customers/country/<int:country_id>',
         '/customers/country/<country_name>-<int:country_id>',
-        '/customers/country/<int:country_id>/page/<int:page>/',
-        '/customers/country/<country_name>-<int:country_id>/page/<int:page>/',
+        '/customers/country/<int:country_id>/page/<int:page>',
+        '/customers/country/<country_name>-<int:country_id>/page/<int:page>',
     ], 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
@@ -62,7 +62,7 @@ class WebsiteCustomer(http.Controller):
 
         # pager
         pager = request.website.pager(
-            url="/customers/", total=len(partner_ids), page=page, step=self._references_per_page,
+            url="/customers", total=len(partner_ids), page=page, step=self._references_per_page,
             scope=7, url_args=post
         )
 
@@ -83,7 +83,7 @@ class WebsiteCustomer(http.Controller):
         }
         return request.website.render("website_customer.index", values)
 
-    @http.route(['/customers/<int:partner_id>/', '/customers/<partner_name>-<int:partner_id>/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/customers/<int:partner_id>', '/customers/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
     def customer(self, partner_id, **post):
         partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
         values = website_partner.get_partner_template_value(partner)
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index ad924cba55d..ba89f456e23 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -5,7 +5,7 @@
 <!-- Layout add nav and footer -->
 <template id="footer_custom" inherit_id="website.layout" name="Footer Customer References Link">
     <xpath expr="//footer//div[@name='info']/ul" position="inside">
-        <li><a href="/customers/">Our References</a></li>
+        <li><a href="/customers">Our References</a></li>
     </xpath>
 </template>
 
@@ -44,11 +44,11 @@
                             </t>
                             <t t-foreach="partners_data" t-as="partner_data" class="media">
                                 <div class="media">
-                                    <a class="pull-left" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                                    <a class="pull-left" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
                                         <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
                                     </a>
                                     <div class="media-body" style="min-height: 64px;">
-                                        <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/" t-esc="partner_data.get('name')"/>
+                                        <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }" t-esc="partner_data.get('name')"/>
                                         <div t-raw="partner_data.get('website_short_description') or ''"/>
                                     </div>
                                 </div>
@@ -68,7 +68,7 @@
 <template id="opt_country" inherit_option_id="website_customer.index" name="Show Map">
     <xpath expr="//div[@id='ref_left_column']" position="inside">
 
-        <iframe t-attf-src="/google_map/?partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/&amp;output=embed/"
+        <iframe t-attf-src="/google_map/?partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/&amp;output=embed"
             style="width:100%; border:0; padding:0; margin:0;"></iframe>
     </xpath>
 </template>
@@ -80,7 +80,7 @@
             <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="/customers/#{ country_dict['country_id'][0] and 'country/%s/' % slug(country_dict['country_id']) or '' }#{ search_path }">
+                        <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 '0'"/>
                             <t t-esc="country_dict['country_id'][1]"/>
                         </a>
@@ -143,7 +143,7 @@
                         </div>
                     </address>
                     <div>
-                        <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/#references/" t-if="implemented_partner_ids">
+                        <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/#references" t-if="implemented_partner_ids">
                             <t t-esc="len(implemented_partner_ids)"/> references
                         </a>
                     </div>
@@ -158,11 +158,11 @@
         <t t-if="implemented_partners_data">
             <h3 id="references">References</h3>
             <div t-foreach="implemented_partners_data" t-as="partner_data" class="media">
-                <a class="pull-left" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                <a class="pull-left" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
                     <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
                 </a>
                 <div class="media-body" style="min-height: 64px;">
-                    <a class="media-heading" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                    <a class="media-heading" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
                         <t t-if="partner_data.get('parent_id')"><span t-esc="partner_data.get('parent_id')[1]"/></t> <span t-esc="partner_data.get('name')"/>
                     </a>
                     <div t-if="partner_data.get('website_short_description')" t-raw="partner_data.get('website_short_description')"/>