From e039e76883ef2d2bcbeaf3090330cc793516a448 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 21 Aug 2013 16:09:53 +0200
Subject: [PATCH] [IMP] Improved template's t-foreach

You need to pull Rev#4980 of server/trunk-website-al

bzr revid: fme@openerp.com-20130821140953-zb2hdglg1nvp2ckq
---
 addons/website/views/views.xml                |  6 ++--
 .../views/website_contract.xml                | 10 +++---
 addons/website_event/views/website_event.xml  | 36 +++++++++----------
 addons/website_hr/views/website_hr.xml        | 20 +++++------
 .../website_project/views/website_project.xml | 18 +++++-----
 addons/website_sale/views/website_sale.xml    | 10 +++---
 6 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index a2b42cf2f84..bc6c73820c9 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -380,9 +380,9 @@
                     <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' " >
                         <a t-att-href=" pager['page_start']['url'] if pager['page']['num'] != 1 else '' ">Prev</a>
                     </li>
-                    <t t-foreach="pager['pages']">
-                        <li t-att-class=" 'active' if num == pager['page']['num'] else '' ">
-                            <a t-att-href="url" t-raw="num"></a>
+                    <t t-foreach="pager['pages']" t-as="page">
+                        <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' ">
+                            <a t-att-href="page['url']" t-raw="page['num']"></a>
                         </li>
                     </t>
                     <li t-att-class=" 'disabled' if pager['page']['num'] == pager['page_count'] else '' " >
diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml
index 3ec536d3677..1991de3ec61 100644
--- a/addons/website_contract/views/website_contract.xml
+++ b/addons/website_contract/views/website_contract.xml
@@ -18,15 +18,15 @@
             <t t-set="title">References</t>
             <div class="container">
                 <div class="thumbnails grid grid-align-top">
-                    <div t-foreach="partner_ids" t-as="partner_id" class="span6">
+                    <div t-foreach="partner_ids" t-as="partner" class="span6">
                         <div class="media thumbnail">
                             <a class="pull-left" href="#">
-                                <img class="media-object" t-att-src="partner_id.img('image_small')"/>
+                                <img class="media-object" t-att-src="partner.img('image_small')"/>
                             </a>
                             <div class="media-body">
-                                <t t-call="website.publish"><t t-set="object" t-value="partner_id"/></t>
-                                <h5 class="media-heading" t-field="partner_id.name"/>
-                                <pre t-field="partner_id.website_testimonial"/>
+                                <t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
+                                <h5 class="media-heading" t-field="partner.name"/>
+                                <pre t-field="partner.website_testimonial"/>
                             </div>
                         </div>
                     </div>
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index be9902732f4..1cea730f475 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -43,33 +43,33 @@
                     </div>
                     <div class="span8">
                         <ul class="media-list">
-                            <li t-foreach="event_ids" t-as="event_id" class="media thumbnail">
+                            <li t-foreach="event_ids" t-as="event" class="media thumbnail">
                                 <div class="media-body">
-                                    <span t-if="not event_id.event_ticket_ids" class="label pull-right">No tickets needed.</span>
-                                    <t t-if="event_id.event_ticket_ids">
-                                        <span t-if="event_id.register_avail == 9999" class="label pull-right label-info">Tickets availables.</span>
-                                        <span t-if="not event_id.register_avail" class="label pull-right">No ticket available.</span>
-                                        <span t-if="event_id.register_avail and event_id.register_avail != 9999" t-att-class="'label pull-right label-%%s' %% (event_id.register_avail &lt;= 10 and 'warning' or 'info')">
-                                            <t t-if="event_id.register_avail &lt;= 10">Only</t>
-                                            <t t-esc="event_id.register_avail"/>
-                                            <t t-if="event_id.register_avail &gt; 1">tickets </t>
-                                            <t t-if="event_id.register_avail == 1">ticket </t>
+                                    <span t-if="not event.event_ticket_ids" class="label pull-right">No tickets needed.</span>
+                                    <t t-if="event.event_ticket_ids">
+                                        <span t-if="event.register_avail == 9999" class="label pull-right label-info">Tickets availables.</span>
+                                        <span t-if="not event.register_avail" class="label pull-right">No ticket available.</span>
+                                        <span t-if="event.register_avail and event.register_avail != 9999" t-att-class="'label pull-right label-%%s' %% (event.register_avail &lt;= 10 and 'warning' or 'info')">
+                                            <t t-if="event.register_avail &lt;= 10">Only</t>
+                                            <t t-esc="event.register_avail"/>
+                                            <t t-if="event.register_avail &gt; 1">tickets</t>
+                                            <t t-if="event.register_avail == 1">ticket</t>
                                             available.
                                         </span>
                                     </t>
-                                    <h4 class="media-heading"><a t-att-href="'/event/%%s/' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
-                                    <t t-call="website.publish"><t t-set="object" t-value="event_id"/></t>
+                                    <h4 class="media-heading"><a t-att-href="'/event/%%s/' %% event.id"><span t-field="event.name"> </span></a></h4>
+                                    <t t-call="website.publish"><t t-set="object" t-value="event"/></t>
                                     <div>
-                                        <span t-field="event_id.type">: </span>
-                                        <t t-if="event_id.user_id">
-                                            Organized by: <span t-field="event_id.user_id"> </span>
+                                        <span t-field="event.type">: </span>
+                                        <t t-if="event.user_id">
+                                            Organized by: <span t-field="event.user_id"> </span>
                                         </t>
                                     </div>
                                     <div>
-                                        <i class="icon-time"></i> <span t-field="event_id.date_begin"> </span> <i>to</i> <span t-field="event_id.date_end"> </span>
+                                        <i class="icon-time"></i> <span t-field="event.date_begin"> </span> <i>to</i> <span t-field="event.date_end"> </span>
                                     </div>
-                                    <div t-if="event_id.country_id">
-                                        <i class="icon-map-marker"></i> <span t-field="event_id.city"> </span>  <span t-field="event_id.zip"> </span>, <span t-field="event_id.country_id"> </span>
+                                    <div t-if="event.country_id">
+                                        <i class="icon-map-marker"></i> <span t-field="event.city"> </span>  <span t-field="event.zip"> </span>, <span t-field="event.country_id"> </span>
                                     </div>
                                 </div>
                             </li>
diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr.xml
index 024aa3e7b6e..3f5c07dc980 100644
--- a/addons/website_hr/views/website_hr.xml
+++ b/addons/website_hr/views/website_hr.xml
@@ -29,20 +29,20 @@
             </t>
             <h3>Our team</h3>
             <div class="thumbnails">
-                <div t-foreach="employee_ids" t-as="employee_id" class="span4 mt16">
+                <div t-foreach="employee_ids" t-as="employee" class="span4 mt16">
                     <div class="media thumbnail">
                         <a class="pull-left" href="#">
-                            <img class="media-object" t-att-src="employee_id.img('image_small')"/>
+                            <img class="media-object" t-att-src="employee.img('image_small')"/>
                         </a>
                         <div class="media-body">
-                            <t t-call="website.publish"><t t-set="object" t-value="employee_id"/></t>
-                            <h5 class="media-heading" t-field="employee_id.name"/>
-                            <div t-field="employee_id.department_id"/>
-                            <div t-field="employee_id.job_id"/>
-                            <div t-field="employee_id.work_location"/>
-                            <div t-field="employee_id.work_phone"/>
-                            <div t-field="employee_id.work_email"/>
-                            <div t-field="employee_id.public_info"/>
+                            <t t-call="website.publish"><t t-set="object" t-value="employee"/></t>
+                            <h5 class="media-heading" t-field="employee.name"/>
+                            <div t-field="employee.department_id"/>
+                            <div t-field="employee.job_id"/>
+                            <div t-field="employee.work_location"/>
+                            <div t-field="employee.work_phone"/>
+                            <div t-field="employee.work_email"/>
+                            <div t-field="employee.public_info"/>
                         </div>
                     </div>
                 </div>
diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml
index 3864eb8256a..b05b19fd0bf 100644
--- a/addons/website_project/views/website_project.xml
+++ b/addons/website_project/views/website_project.xml
@@ -7,7 +7,7 @@
 
     <template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
         <xpath expr="//body/footer//div[@name='info']/ul" position="inside">
-            <li t-foreach="project_ids" t-as="project_id"><a t-attf-href="/project/#{ project_id.id }/"><t t-esc="project_id.name"/></a></li>
+            <li t-foreach="project_ids" t-as="project"><a t-attf-href="/project/#{ project.id }/"><t t-esc="project.name"/></a></li>
         </xpath>
     </template>
 
@@ -21,7 +21,7 @@
                 <table class="table">
                     <thead>
                         <tr>
-                            <th t-foreach="stages" t-as="stage">
+                            <th t-foreach="stages">
                                 <span t-field="stage_id.name"/>
                             </th>
                         </tr>
@@ -29,19 +29,19 @@
                     <tbody>
                         <tr>
                             <td t-foreach="stages" t-as="stage">
-                                <div t-foreach="task_ids" t-as="task_id" class="thumbnail">
-                                    <a t-attf-href="/task/#{ task_id.id }/"><span t-field="task_id.name"/></a>
+                                <div t-foreach="stage['task_ids']" t-as="task" class="thumbnail">
+                                    <a t-attf-href="/task/#{ task.id }/"><span t-field="task.name"/></a>
                                     <div>
-                                        Assigned to <span t-field="task_id.user_id"/>
+                                        Assigned to <span t-field="task.user_id"/>
                                     </div>
                                     <div>
-                                        <span t-foreach="task_id.categ_ids" t-as="categ_id" class="label">
-                                            <t t-esc="categ_id.name"/>
+                                        <span t-foreach="task.categ_ids" t-as="categ" class="label">
+                                            <t t-esc="categ.name"/>
                                         </span>
                                     </div>
                                     <small>
-                                        <i class="icon-time"></i> <span t-field="task_id.date_start"/><br/>
-                                        <t t-if="task_id.date_end">Ending Date: <span t-field="task_id.date_end"/></t>
+                                        <i class="icon-time"></i> <span t-field="task.date_start"/><br/>
+                                        <t t-if="task.date_end">Ending Date: <span t-field="task.date_end"/></t>
                                     </small>
                                 </div>
                             </td>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index cf71349a75c..c3c7d841cc4 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -269,18 +269,18 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <t t-foreach="suggested_products" t-as="product_id">
+                    <t t-foreach="suggested_products" t-as="product">
                         <tr>
                             <td>
-                                <a t-attf-href="/shop/product/#{ product_id.id }/"><span t-field="product_id.name"/></a><br/>
-                                <small t-field="product_id.description_sale"/>
+                                <a t-attf-href="/shop/product/#{ product.id }/"><span t-field="product.name"/></a><br/>
+                                <small t-field="product.description_sale"/>
                             </td>
                             <td>
-                               <span t-field="product_id.list_price"></span>€
+                               <span t-field="product.list_price"></span>€
                             </td>
                             <td>
                                 <div class="pull-right">
-                                    <a t-attf-href="./add_cart/#{ product_id.id }/" class="btn btn-small btn-success">+</a>
+                                    <a t-attf-href="./add_cart/#{ product.id }/" class="btn btn-small btn-success">+</a>
                                 </div>
                             </td>
                         </tr>