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

[IMP] merge title of o2m list view into list header 

bzr revid: xmo@openerp.com-20111213144955-o4menzpyak0c1ugx
This commit is contained in:
Xavier Morel 2011-12-13 15:49:55 +01:00
parent dbe5e012e4
commit 987a9cc07b
4 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/web/static/src/css/base.css
View File

@ -1108,6 +1108,11 @@ label.error {
white-space: normal;
}
.openerp .oe_form_field_one2many .oe-actions h3.oe_view_title {
display: inline;
margin: 0 0.5em 0 0;
}
/* Uneditable Form View */
.openerp .oe_form_readonly {

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

@ -2064,6 +2064,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({
this.views = views;
this.viewmanager = new openerp.web.ViewManager(this, this.dataset, views);
this.viewmanager.template = 'One2Many.viewmanager';
this.viewmanager.registry = openerp.web.views.clone({
list: 'openerp.web.form.One2ManyListView',
form: 'openerp.web.FormView',
@ -2280,6 +2281,7 @@ openerp.web.form.One2ManyDataSet = openerp.web.BufferedDataSet.extend({
});
openerp.web.form.One2ManyListView = openerp.web.ListView.extend({
_template: 'One2Many.listview',
do_add_record: function () {
if (this.options.editable) {
this._super.apply(this, arguments);

3
addons/web/static/src/js/view_list.js
View File

@ -3,6 +3,7 @@ var _t = openerp.web._t;
var QWeb = openerp.web.qweb;
openerp.web.views.add('list', 'openerp.web.ListView');
openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# */ {
_template: 'ListView',
defaults: {
// records can be selected one by one
'selectable': true,
@ -200,7 +201,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
this.setup_columns(this.fields_view.fields, grouped);
this.$element.html(QWeb.render("ListView", this));
this.$element.html(QWeb.render(this._template, this));
// Head hook
this.$element.find('.all-record-selector').click(function(){
self.$element.find('.oe-record-selector input').prop('checked',

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

@ -481,6 +481,9 @@
<option t-if="view_manager.searchview" value="edit" data-model="ir.ui.view" t-att-data-id="view_manager.searchview.view_id"> - Edit SearchView</option>
<option t-if="view_manager.action" value="edit" t-att-data-model="view_manager.action.type" t-att-data-id="view_manager.action.id"> - Edit Action</option>
</t>
<t t-extend="ViewManager" t-name="One2Many.viewmanager">
<t t-jquery="span.oe_view_title_text" t-operation="replace"/>
</t>
<t t-name="Sidebar">
<a class="toggle-sidebar"></a>
@ -612,6 +615,18 @@
</tr>
</tfoot>
</table>
<t t-extend="ListView" t-name="One2Many.listview">
<t t-jquery="thead.ui-widget-header > tr:first">
this.removeAttr('t-if');
</t>
<t t-jquery="td.oe-actions">
this.removeAttr('t-if');
var $title = $(document.createElement('h3')).addClass('oe_view_title');
$title.append($(document.createElement('t')).attr(
't-esc', 'fields_view.arch.attrs.string'));
this.prepend($title);
</t>
</t>
<th t-name="Listview.navigation.button" t-if="options.pager !== false"
class="oe-list-pager" t-att-colspan="columns_count">
<button type="button" disabled="disabled"