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

[IMP] move selection checkbox after group and count columns 

bzr revid: xmo@openerp.com-20110524115755-v7e3wmxk9r6bitn7
This commit is contained in:
Xavier Morel 2011-05-24 13:57:55 +02:00
parent 96fabdeff6
commit 21e2edea63
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
addons/base/static/src/js/list.js
View File

@ -567,22 +567,25 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
});
}
placeholder.appendChild($row[0]);
self.pad($row);
var $group_column = $('<th>')
.text((group.value instanceof Array ? group.value[1] : group.value))
.appendTo($row);
if (group.openable) {
$group_column
.prepend('<span class="ui-icon ui-icon-triangle-1-e">');
}
self.indent($group_column, group.level);
// count column
$('<td>').text(group.length).appendTo($row);
self.pad($row);
_(self.columns).chain()
.filter(function (column) {return !column.invisible;})
.each(function (column) {
if (column.id === '_group') {
var $group_column = $('<th>')
.text((group.value instanceof Array ? group.value[1] : group.value))
.appendTo($row);
if (group.openable) {
$group_column
.prepend('<span class="ui-icon ui-icon-triangle-1-e">');
}
self.indent($group_column, group.level);
} else if (column.id === '_count') {
$('<td>').text(group.length).appendTo($row);
if (column.meta) {
// do not do anything
} else if (column.id in group.aggregates) {
var value = group.aggregates[column.id];
var format;

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

@ -177,9 +177,14 @@
</th>
</tr>
<tr t-if="options.header">
<t t-foreach="columns" t-as="column">
<th t-if="column.meta">
<t t-esc="column.string"/>
</th>
</t>
<th t-if="options.selectable"/>
<t t-foreach="columns" t-as="column">
<th t-if="column.invisible !== '1'" t-att-data-id="column.id"
<th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id"
t-att-class="((options.sortable and column.tag !== 'button') ? 'oe-sortable' : null)">
<t t-if="column.tag !== 'button'">
<t t-esc="column.string"/>
@ -200,22 +205,27 @@
</t>
</t>
<tr t-name="ListView.row" t-att-style="style" t-att-class="row_parity">
<t t-foreach="columns" t-as="column">
<td t-if="column.meta">
</td>
</t>
<th t-if="options.selectable" class="oe-record-selector">
<input type="checkbox"/>
</th>
<t t-foreach="columns" t-as="column">
<t t-set="attrs" t-value="column.attrs_for(row.data)"/>
<td t-if="column.invisible !== '1'" t-att-title="column.help"
<td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help"
class="oe-field-cell" t-att-data-field="column.id">
<t t-set="attrs" t-value="column.attrs_for(row.data)"/>
<t t-if="!attrs.invisible">
<t t-set="is_button" t-value="column.tag === 'button'"/>
<!-- TODO: get correct widget from form -->
<t t-if="!is_button and !column.meta and row['data'][column.id].value !== false">
<t t-if="!is_button and row['data'][column.id].value !== false">
<t t-set="value" t-value="row['data'][column.id].value"/>
<t t-esc="value instanceof Array ? value[1] : value"/>
</t>
<button type="button" t-att-title="column.help"
t-if="is_button and !column.meta">
t-if="is_button">
<img t-att-src="'/base/static/src/img/icons/' + column.icon + '.png'"
t-att-alt="column.string"/>
</button>