[IMP] crm (sales_team), hr_recruitment, project: fixed display of alias on kanban view. The alias is not shown when not having alias_name (left part) or alias_domain (right part) defined. Indeed only using alias_id.value is not correct, as we could have '<alias_name>' or 'Inactive Alias', depending on the missing part.

This commit is contained in:
Thibault Delavallée
2014-07-02 11:35:39 +02:00
parent 58481cee00
commit 160ddc0240
3 changed files with 10 additions and 4 deletions
+3 -1
View File
@@ -87,13 +87,15 @@
<data>
<xpath expr="//templates" position="before">
<field name="alias_id"/>
<field name="alias_name"/>
<field name="alias_domain"/>
<field name="use_leads"/>
<field name="use_opportunities"/>
<field name="monthly_open_leads"/>
<field name="monthly_planned_revenue"/>
</xpath>
<xpath expr="//h4[@name='name']" position="after">
<div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
<div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_name.value and record.alias_domain.value">
<small><span class="oe_e oe_e_alias" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
</div>
<div class="oe_items_list">
@@ -392,6 +392,8 @@
<field name="arch" type="xml">
<kanban class="oe_background_grey">
<field name="name"/>
<field name="alias_name"/>
<field name="alias_domain"/>
<field name="department_id"/>
<field name="no_of_recruitment"/>
<field name="color"/>
@@ -417,7 +419,7 @@
<li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
</ul>
</div>
<div class = "oe_kanban_content">
<div class="oe_kanban_content">
<t t-if="record.user_id.raw_value">
<img t-att-src="kanban_image('res.users', 'image_medium', record.user_id.raw_value[0])" t-att-title="record.user_id.value" class="oe_kanban_avatar oe_job_avatar"/>
</t>
@@ -434,7 +436,7 @@
(<t t-esc="record.manager_id.value"/>)
</span>
</div>
<div class="oe_job_alias oe_kanban_ellipsis" t-if=" record.alias_id.value and record.state.raw_value == 'recruit'">
<div class="oe_job_alias oe_kanban_ellipsis" t-if=" record.alias_name.value and record.alias_domain.value and record.state.raw_value == 'recruit'">
<span class="oe_e">%%</span><small><field name="alias_id"/></small>
</div>
+3 -1
View File
@@ -242,6 +242,8 @@
<field name="task_count"/>
<field name="task_ids"/>
<field name="alias_id"/>
<field name="alias_name"/>
<field name="alias_domain"/>
<field name="doc_count"/>
<templates>
<t t-name="kanban-box">
@@ -256,7 +258,7 @@
</div>
<div class="oe_kanban_content">
<h4><field name="name"/></h4>
<div class="oe_kanban_alias" t-if="record.alias_id.value">
<div class="oe_kanban_alias" t-if="record.alias_name.value and record.alias_domain.value">
<span class="oe_e oe_e_alias">%%</span><small><field name="alias_id"/></small>
</div>
<div class="oe_kanban_project_list">