[FIX] website_customer: removed redundant template 'customer_contact', fixed the...

bzr revid: openerp-sle@openerp-sle.home-20140129150838-pj9hmexxl3sk89tp

diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index e7e5337..9918b73 100644 (file)
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -33,7 +33,7 @@ class WebsiteCustomer(http.Controller):
                 ('name', 'ilike', "%%%s%%" % post.get("search")),
                 ('website_description', 'ilike', "%%%s%%" % post.get("search"))
             ]
-        country_id = None
+
         if country_id:
             domain += [('country_id', '=', country_id)]
 

diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index def29a7..64eeb32 100644 (file)
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -48,7 +48,7 @@
                                     <h4>
                                         <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/" t-esc="partner_data.get('name')"/>
                                     </h4>
-                                    <div t-raw="partner_data.get('website_short_description')"/>
+                                    <div t-raw="partner_data.get('website_short_description') or ''"/>
                                 </div>
                                 <div class="clearfix mb8"/>
                             </t>
@@ -117,36 +117,6 @@
   </t>
 </template>
 
-<template id="customer_contact" inherit_id="website_customer.details" inherit_option_id="website_customer.details" name="Customer Contacts">
-    <xpath expr="//div[@id='left_column']" position="inside">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4>Customer Reference</h4>
-            </div>
-            <div class="panel-body">
-                <div class="text-center">
-                    <img class="img img-shadow" t-attf-src="data:image/png;base64,#{partner_data.get('image_medium')}"/>
-                </div>
-                <address class="mt16 mb8">
-                    <strong t-esc="partner_data.get('name')"/>
-                    <t t-if="partner_data.get('commercial_partner_id')">
-                        <p t-raw="'&lt;br/&gt;'.join(partner_data.get('commercial_partner_id')[1].split('\n')[1:])"/>
-                    </t>
-                    <div t-if="partner_data.get('phone')">
-                        <span class="fa fa-phone"/> <span t-esc="partner_data.get('phone')"/>
-                    </div>
-                    <div t-if="partner_data.get('email')">
-                        <span class="fa fa-envelope"/>
-                        <a t-att-href="'mailto:'+partner_data.get('email')">
-                          <span t-esc="partner_data.get('email')"/>
-                        </a>
-                    </div>
-                </address>
-            </div>
-        </div>
-    </xpath>
-</template>
-
 <template id="partner_assign" inherit_option_id="website_customer.details" inherit_id="website_customer.details" name="Implemented By">
     <xpath expr="//div[@id='left_column']" position="inside">
         <t t-if="assigned_partner_data">