pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REV] Reverted most changes, to lessen the number of

Browse Source 
changed in a stable branch.

bzr revid: tde@openerp.com-20131104115909-exhujer0lqqr4xk5
This commit is contained in:
Thibault Delavallée
2013-11-04 12:59:09 +01:00
parent 07e19391bb
commit 4c460dfa4e
2 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/view_form.js
+8 -15
View File
@@ -5527,22 +5527,15 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({
.read_slice(_.union(_.keys(self.distant_fields), ['id']), {}).then(function (records) {
var ids = _.pluck(records, 'id');
return self.dataset.name_get(ids).then(function (records_name) {
_.each(records, function (record) {
var name = _.find(records_name, function (val) {return val[0] == record.id;})[1];
var widget_item = {
'id': record.id,
'name': name,
/* :deprecated: should probably be removed */
'bar_color': record.bar_color || 0,
'bar_fold': record.bar_fold || false,
}
if (record.bar_fold && record.id != self.get('value')) {
selection_folded.push(widget_item);
} else {
selection_unfolded.push(widget_item);
}
_.each(records, function (record) {
var name = _.find(records_name, function (val) {return val[0] == record.id;})[1];
if (record.fold && record.id != self.get('value')) {
selection_folded.push([record.id, name]);
} else {
selection_unfolded.push([record.id, name]);
}
});
});
});
});
} else {
// For field type selection filter values according to
addons/web/static/src/xml/base.xml
+6 -6
View File
@@ -1220,9 +1220,9 @@
<ul t-att-class="'oe_form_field_status ' + (widget.options.clickable ? 'oe_form_status_clickable' : 'oe_form_status')" t-att-style="widget.node.attrs.style"/>
</t>
<t t-name="FieldStatus.content">
<t t-foreach="widget.selection.unfolded" t-as="item">
<li t-attf-class="#{item.id === widget.get('value') and 'oe_active'}" t-att-data-id="item.id">
<span class="label"><t t-esc="item.name"/></span>
<t t-foreach="widget.selection.unfolded" t-as="i">
<li t-att-class="i[0] === widget.get('value') ? 'oe_active' : ''" t-att-data-id="i[0]">
<span class="label"><t t-esc="i[1]"/></span>
<!-- are you mit ? -->
<span class="arrow"><span></span></span>
</li>
@@ -1231,9 +1231,9 @@
<li>
<span class="label oe_dropdown_toggle oe_dropdown_arrow">More</span>
<ul class="oe_dropdown_menu">
<t t-foreach="widget.selection.folded" t-as="item">
<li t-att-class="item.id === widget.get('value') ? 'oe_active' : ''" t-att-data-id="item.id">
<span class="label"><t t-esc="item.name"/></span>
<t t-foreach="widget.selection.folded" t-as="i">
<li t-att-class="i[0] === widget.get('value') ? 'oe_active' : ''" t-att-data-id="i[0]">
<span class="label"><t t-esc="i[1]"/></span>
</li>
</t>
</ul>