odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Fixed Status bar wrapping problems 

bzr revid: fme@openerp.com-20120702084119-cfmdc7vqonwb05f8
This commit is contained in:
Fabien Meghazi 2012-07-02 10:41:19 +02:00
parent 9e4f8eb50c
commit 2571ad25eb
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/web/static/src/js/view_form.js
View File

@ -4359,10 +4359,13 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
}); });
instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
tagName: "span", template: "FieldStatus",
start: function() { start: function() {
this._super(); this._super();
this.selected_value = null; this.selected_value = null;
if (this.$element.parent().is('header')) {
this.$element.after('<div class="oe_clear"/>');
}
// preview in start only for selection fields, because of the dynamic behavior of many2one fields. // preview in start only for selection fields, because of the dynamic behavior of many2one fields.
if (this.field.type in ['selection']) { if (this.field.type in ['selection']) {
this.render_list(); this.render_list();

20
addons/web/static/src/xml/base.xml
View File

@ -1006,17 +1006,17 @@
<span></span> <span></span>
</span> </span>
</t> </t>
<t t-name="FieldStatus">
<ul class="oe_form_steps"/>
</t>
<t t-name="FieldStatus.content"> <t t-name="FieldStatus.content">
<ul class="oe_form_steps"> <t t-set="size" t-value="widget.to_show.length"/>
<t t-set="size" t-value="widget.to_show.length"/> <t t-foreach="_.range(size)" t-as="i">
<t t-foreach="_.range(size)" t-as="i"> <li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''">
<li t-att-class="widget.to_show[i][0] === widget.selected_value ? 'oe_form_steps_active' : ''"> <span><t t-esc="widget.to_show[i][1]"/></span>
<span><t t-esc="widget.to_show[i][1]"/></span> <img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/>
<img t-att-src='_s + "/web/static/src/img/form_steps.png"' class="oe_form_steps_arrow" t-if="i &lt; size - 1"/> </li>
</li> </t>
</t>
</ul>
<div class="oe_clear"/>
</t> </t>
<t t-name="FieldBinaryImage"> <t t-name="FieldBinaryImage">
<span class="oe_form_field oe_form_field_image"> <span class="oe_form_field oe_form_field_image">