From 17dfb2256d1b8ae477c8d9b63a72d90c6b92dbba Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 25 Oct 2011 18:58:10 +0200
Subject: [PATCH] [IMP] Improved project.task kanban view

[ADD] Added static folder structure for the pad image

[FIX] Added relation for field user_email. Using user_id for gravatar won't work.

bzr revid: fme@openerp.com-20111025165810-eu5718pd0p2dagib
---
 addons/project/project.py                     |   1 +
 addons/project/project_view.xml               |  18 +++++++++---------
 .../static/src/img/kanban-pad-openerp.png     | Bin 0 -> 410 bytes
 3 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 addons/project/static/src/img/kanban-pad-openerp.png

diff --git a/addons/project/project.py b/addons/project/project.py
index 05bed8a9b9a..3431aaec229 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -471,6 +471,7 @@ class task(osv.osv):
         'company_id': fields.many2one('res.company', 'Company'),
         'id': fields.integer('ID', readonly=True),
         'color': fields.integer('Color Index'),
+        'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
     }
 
     _defaults = {
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 94724993a9d..3f638000b40 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -325,8 +325,10 @@
                     <field name="priority"/>
                     <field name="state"/>
                     <field name="type_id"/>
+                    <field name="user_email"/>
                     <templates>
                         <t t-name="kanban-box">
+                            <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.underscored(_.trim(record.name.raw_value))"/></t>
                             <t t-set="color" t-value="kanban_color(record.color.raw_value || record.type_id.raw_value)"/>
                             <div t-att-class="color + (record.priority.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
                                 <div class="oe_kanban_box oe_kanban_color_border">
@@ -338,7 +340,7 @@
                                                 <field name="name"/>
                                             </td>
                                             <td valign="top" width="22">
-                                                <img t-att-src="kanban_gravatar(record.user_id.value, 22)" class="oe_kanban_gravatar"/>
+                                                <img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar"/>
                                             </td>
                                         </tr>
                                     </table>
@@ -350,9 +352,7 @@
                                             <field name="project_id"/>
                                         </div>
                                         <div class="oe_kanban_small">
-                                            <a target="_blank" t-att-href="'http://pad.openerp.com/'+record.name.raw_value.toLowerCase().replace(' ','-')">
-                                                http://pad.openerp.com/<t t-esc="record.name.raw_value.toLowerCase().replace(' ','-')"/>
-                                            </a>
+                                            <a target="_blank" t-att-href="pad_url"><t t-esc="pad_url"/></a>
                                         </div>
                                         <div class="oe_kanban_small">
                                             <i><field name="date_deadline"/></i>
@@ -360,17 +360,17 @@
                                     </div>
                                     <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
                                         <div class="oe_kanban_left">
-                                            <a string="Edit" icon="gtk-edit" type="edit"/>                                               
+                                            <a string="Edit" icon="gtk-edit" type="edit"/>
                                             <a string="Change Color" icon="color-picker" type="color" name="color"/>
                                             <a string="" />
-                                            <a title="OpenERP Pad" icon="pad-openerp" target="_blank" t-att-href="'http://pad.openerp.com/'+record.name.value" style="text-decoration: none;" >
-                                                <img src="/web/static/src/img/icons/pad-openerp.png" border="0" width="16" height="16"/>
-                                            </a>                                                
+                                            <a title="OpenERP Pad" icon="pad-openerp" target="_blank" t-att-href="pad_url" style="text-decoration: none;" >
+                                                <img src="/project/static/src/img/kanban-pad-openerp.png" border="0" width="16" height="16"/>
+                                            </a>
                                             <a name="%(action_project_task_delegate)d" string="Delegate" states="pending,open,draft" type="action" icon="gtk-sort-descending" />
                                         </div>
                                         <div class="oe_kanban_right">
                                             <a name="do_cancel" string="Mark Lost" states="draft,open,pending" type="object" icon="lead-stage-lost"/>
-                                            <a name="do_pending" string="Pending"  states="open" type="object" icon="gtk-media-pause"/>        
+                                            <a name="do_pending" string="Pending"  states="open" type="object" icon="gtk-media-pause"/>
                                             <a name="action_close" string="Mark Won"  states="pending,open" type="object" icon="lead-stage-won"/>
                                         </div>
                                         <br class="oe_kanban_clear"/>
diff --git a/addons/project/static/src/img/kanban-pad-openerp.png b/addons/project/static/src/img/kanban-pad-openerp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad64c5aea0e668dffe62df3a4f390d3892211ee1
GIT binary patch
literal 410
zcmex=<NpH&0WUXCHwH#V1_nkTWcYuZ!I^=Rjh%y?jgy0&gNuukn^%mVmxqT}T0~Sp
zOhHyjNkLX#UPZ%1M@7w0U0z<-R@czf+{(&IS=-*l-on|$(#jlU2qPC47cUR56hFU|
zxvIRXImzJv0R}-11_1^EW=16jCP7AKLB{__7{nPEn1Rkj223ohKnYa=21aHUMkaQ+
z6cbPj3#*VKgRr59s8Ud3VIxqPC?m+L$bgj%C@d++2s9U2h7o9|u;Tw)3_L*lm;{*x
z8SEKs_KID9JmnR)-l9jBB|9F!)4Wvk_tWa$7R`)Ru~}R0lueN|Z@76R@yIn*ZS8$`
zP82;kJ?+4v()KB{UL_>_Q(EP1x3Kq!y4?5LRl6;e{H*R8bSPY2y@_Ly#$?&;TmL>4
PzPPb}Lc%(0`~Noqfn#N*

literal 0
HcmV?d00001