[MERGE] saas2
bzr revid: nicolas.vanhoren@openerp.com-20131018134149-yveqfs6tqwnjo6xt
This commit is contained in:
commit
ebeeae0ed4
|
@ -189,6 +189,8 @@ class WebRequest(object):
|
||||||
|
|
||||||
def auth_method_user():
|
def auth_method_user():
|
||||||
request.uid = request.session.uid
|
request.uid = request.session.uid
|
||||||
|
if not request.uid:
|
||||||
|
raise SessionExpiredException("Session expired")
|
||||||
|
|
||||||
def auth_method_admin():
|
def auth_method_admin():
|
||||||
if not request.db:
|
if not request.db:
|
||||||
|
|
|
@ -1453,7 +1453,7 @@
|
||||||
display: table-row;
|
display: table-row;
|
||||||
height: inherit;
|
height: inherit;
|
||||||
}
|
}
|
||||||
.openerp .oe_view_manager .oe_view_manager_view_kanban {
|
.openerp .oe_view_manager .oe_view_manager_view_kanban:not(:empty) {
|
||||||
height: inherit;
|
height: inherit;
|
||||||
}
|
}
|
||||||
.openerp .oe_view_manager table.oe_view_manager_header {
|
.openerp .oe_view_manager table.oe_view_manager_header {
|
||||||
|
|
|
@ -1169,7 +1169,7 @@ $sheet-padding: 16px
|
||||||
.oe_view_manager_body
|
.oe_view_manager_body
|
||||||
display: table-row
|
display: table-row
|
||||||
height: inherit
|
height: inherit
|
||||||
.oe_view_manager_view_kanban
|
.oe_view_manager_view_kanban:not(:empty)
|
||||||
height: inherit
|
height: inherit
|
||||||
|
|
||||||
table.oe_view_manager_header
|
table.oe_view_manager_header
|
||||||
|
|
|
@ -1547,7 +1547,7 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
|
||||||
context: context
|
context: context
|
||||||
}).then(function (results) {
|
}).then(function (results) {
|
||||||
if (_.isEmpty(results)) { return null; }
|
if (_.isEmpty(results)) { return null; }
|
||||||
return [{label: _.escape(self.attrs.string)}].concat(
|
return [{label: self.attrs.string}].concat(
|
||||||
_(results).map(function (result) {
|
_(results).map(function (result) {
|
||||||
return {
|
return {
|
||||||
label: _.escape(result[1]),
|
label: _.escape(result[1]),
|
||||||
|
|
|
@ -3664,7 +3664,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
|
||||||
_.extend(view.options, {
|
_.extend(view.options, {
|
||||||
addable: null,
|
addable: null,
|
||||||
selectable: self.multi_selection,
|
selectable: self.multi_selection,
|
||||||
sortable: false,
|
sortable: true,
|
||||||
import_enabled: false,
|
import_enabled: false,
|
||||||
deletable: true
|
deletable: true
|
||||||
});
|
});
|
||||||
|
|
|
@ -508,10 +508,15 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
|
||||||
var reloaded = $.Deferred();
|
var reloaded = $.Deferred();
|
||||||
this.$el.find('.oe_list_content').append(
|
this.$el.find('.oe_list_content').append(
|
||||||
this.groups.render(function () {
|
this.groups.render(function () {
|
||||||
if ((self.dataset.index === null || self.dataset.index === undefined) && self.records.length ||
|
// Keep '=='. This is not a mistake, this is a wanted behaviour to match null & undefined
|
||||||
self.dataset.index >= self.records.length) {
|
if (self.dataset.index == null) {
|
||||||
|
if (self.records.length) {
|
||||||
self.dataset.index = 0;
|
self.dataset.index = 0;
|
||||||
|
}
|
||||||
|
} else if (self.dataset.index >= self.records.length) {
|
||||||
|
self.dataset.index = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
self.compute_aggregates();
|
self.compute_aggregates();
|
||||||
reloaded.resolve();
|
reloaded.resolve();
|
||||||
}));
|
}));
|
||||||
|
|
Loading…
Reference in New Issue