From 19b126210934bb3c8134f6f33417bd45104f4ecc Mon Sep 17 00:00:00 2001
From: Mehul Patel <mep@odoo.com>
Date: Wed, 5 Jul 2017 14:24:54 +0530
Subject: [PATCH] [IMP] website_sale : Remove deprecated `hidden` product
 attribute type on product variants

Purpose
=======

Hidden mode on product attributes (variants) is deprecated
Beforehand it was used to not show the attribute name  in the order (in case of single attributes). Now it's automatic: if only one value for a product attribute, this value doesn't show up in the product name.
see support ticket 744129

Specification
=============

remove it
---
 addons/website_sale/controllers/main.py       |  2 -
 addons/website_sale/models/product.py         |  2 +-
 addons/website_sale/views/templates.xml       | 59 ++++++++++---------
 .../data/product_demo.xml                     |  2 +-
 4 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 8ec73048832..17d46d1a7ba 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -87,8 +87,6 @@ class TableCompute(object):
 
         return rows
 
-        # TODO keep with input type hidden
-
 
 class WebsiteSaleForm(WebsiteForm):
 
diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index c697973cd5d..bf8a3467865 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -207,7 +207,7 @@ class Product(models.Model):
 class ProductAttribute(models.Model):
     _inherit = "product.attribute"
 
-    type = fields.Selection([('radio', 'Radio'), ('select', 'Select'), ('color', 'Color'), ('hidden', 'Hidden')], default='radio')
+    type = fields.Selection([('radio', 'Radio'), ('select', 'Select'), ('color', 'Color')], default='radio')
 
 
 class ProductAttributeValue(models.Model):
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 3ef9a5acd12..b31a3298c5a 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -316,40 +316,41 @@
                 <input type="hidden" name="search" t-att-value="search" />
                 <ul class="nav nav-pills nav-stacked mt16">
                     <t t-foreach="attributes" t-as="a">
-                        <t t-if="a.type != 'hidden'">
-                            <li t-if="a.value_ids and len(a.value_ids) &gt; 1">
-                                <div>
-                                    <strong t-field="a.name" />
-                                </div>
-                                <t t-if="a.type == 'select'">
-                                    <select class="form-control" name="attrib">
-                                        <option value="" />
-                                        <t t-foreach="a.value_ids" t-as="v">
-                                            <option t-att-value="'%s-%s' % (a.id,v.id)" t-esc="v.name" t-att-selected="v.id in attrib_set" />
-                                        </t>
-                                    </select>
-                                </t>
-                                <t t-if="a.type == 'radio'">
-                                    <ul class="nav nav-pills nav-stacked">
-                                        <t t-foreach="a.value_ids" t-as="v">
-                                            <li t-att-class="'active' if v.id in attrib_set else None">
-                                                <label style="margin: 0 20px;">
-                                                    <input type="checkbox" name="attrib" t-att-value="'%s-%s' % (a.id,v.id)" t-att-checked="'checked' if v.id in attrib_set else None" />
-                                                    <span style="font-weight: normal" t-field="v.name" />
-                                                </label>
-                                            </li>
-                                        </t>
-                                    </ul>
-                                </t>
-                                <t t-if="a.type == 'color'">
+                        <li t-if="a.value_ids and len(a.value_ids) &gt; 1">
+                            <div>
+                                <strong t-field="a.name" />
+                            </div>
+                            <t t-if="a.type == 'select'">
+                                <select class="form-control" name="attrib">
+                                    <option value="" />
                                     <t t-foreach="a.value_ids" t-as="v">
                                         <label t-attf-style="background-color:#{v.html_color or v.name}" t-attf-class="css_attribute_color #{'active' if v.id in attrib_set else ''}">
                                             <input type="checkbox" name="attrib" t-att-value="'%s-%s' % (a.id,v.id)" t-att-checked="'checked' if v.id in attrib_set else None" t-att-title="v.name" />
                                         </label>
+                                        <option t-att-value="'%s-%s' % (a.id,v.id)" t-esc="v.name" t-att-selected="v.id in attrib_set" />
                                     </t>
+                                </select>
+                            </t>
+                            <t t-if="a.type == 'radio'">
+                                <ul class="nav nav-pills nav-stacked">
+                                    <t t-foreach="a.value_ids" t-as="v">
+                                        <li t-att-class="'active' if v.id in attrib_set else None">
+                                            <label style="margin: 0 20px;">
+                                                <input type="checkbox" name="attrib" t-att-value="'%s-%s' % (a.id,v.id)" t-att-checked="'checked' if v.id in attrib_set else None" />
+                                                <span style="font-weight: normal" t-field="v.name" />
+                                            </label>
+                                        </li>
+                                    </t>
+                                </ul>
+                            </t>
+                            <t t-if="a.type == 'color'">
+                                <t t-foreach="a.value_ids" t-as="v">
+                                    <label t-attf-style="background-color:#{v.html_color or v.name}" t-attf-class="css_attribute_color #{'active' if v.id in attrib_set else ''}">
+                                        <input type="checkbox" name="attrib" t-att-value="'%s-%s' % (a.id,v.id)" t-att-checked="'checked' if v.id in attrib_set else None" t-att-title="v.name" />
+                                    </label>
                                 </t>
-                            </li>
-                        </t>
+                            </t>
+                        </li>
                     </t>
                 </ul>
             </form>
@@ -631,7 +632,7 @@
 
             <strong t-field="variant_id.attribute_id.name"/>
 
-            <t t-if="variant_id.attribute_id.type in ['select', 'hidden']">
+            <t t-if="variant_id.attribute_id.type == 'select'">
               <select t-attf-class="form-control #{'js_variant_change' if variant_id.attribute_id.create_variant else ''}" t-att-name="'attribute-%s-%s' % (product.id, variant_id.attribute_id.id)">
                 <t t-foreach="variant_id.value_ids" t-as="value_id">
                   <option t-att-value="value_id.id">
diff --git a/addons/website_sale_options/data/product_demo.xml b/addons/website_sale_options/data/product_demo.xml
index a2acbe46c48..2fc1ca747fc 100644
--- a/addons/website_sale_options/data/product_demo.xml
+++ b/addons/website_sale_options/data/product_demo.xml
@@ -6,7 +6,7 @@
 
         <record id="product_attribute_1" model="product.attribute">
             <field name="name">Duration</field>
-            <field name="type">hidden</field>
+            <field name="type">select</field>
         </record>
         <record id="product_attribute_value_1" model="product.attribute.value">
             <field name="name">1 year</field>