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

[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 3747 rev-id: dle@openerp.com-20131018120136-fvoq337kgx74njsy 

bzr revid: dle@openerp.com-20131018123253-pvf2tg747vflfp6x
This commit is contained in:
Denis Ledoux 2013-10-18 14:32:53 +02:00
parent 3853f642ff 993bff902e
commit c348a2f4cd
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1453,7 +1453,7 @@
display: table-row;
height: inherit;
}
.openerp .oe_view_manager .oe_view_manager_view_kanban {
.openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) {
height: inherit;
}
.openerp .oe_view_manager table.oe_view_manager_header {

2
addons/web/static/src/css/base.sass
View File

@ -1169,7 +1169,7 @@ $sheet-padding: 16px
.oe_view_manager_body
display: table-row
height: inherit
.oe_view_manager_view_kanban
.oe_view_manager_view_kanban:not(:empty)
height: inherit
table.oe_view_manager_header

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

@ -1547,7 +1547,7 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
context: context
}).then(function (results) {
if (_.isEmpty(results)) { return null; }
return [{label: _.escape(self.attrs.string)}].concat(
return [{label: self.attrs.string}].concat(
_(results).map(function (result) {
return {
label: _.escape(result[1]),

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

@ -3664,7 +3664,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
_.extend(view.options, {
addable: null,
selectable: self.multi_selection,
sortable: false,
sortable: true,
import_enabled: false,
deletable: true
});

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

@ -508,10 +508,15 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
var reloaded = $.Deferred();
this.$el.find('.oe_list_content').append(
this.groups.render(function () {
if ((self.dataset.index === null || self.dataset.index === undefined) && self.records.length ||
self.dataset.index >= self.records.length) {
// Keep '=='. This is not a mistake, this is a wanted behaviour to match null & undefined
if (self.dataset.index == null) {
if (self.records.length) {
self.dataset.index = 0;
}
} else if (self.dataset.index >= self.records.length) {
self.dataset.index = 0;
}
self.compute_aggregates();
reloaded.resolve();
}));