[FIX] web,account,google_calendar: chasing breaking spaces
Before this commit, some breaking spaces were present in the js code. Such spaces are misinterpreted and worked by luck. This has become a problem with exported js bunldes (e.g. the external_lib bundle in im_livechat). This commit replaces breaking spaces by regular spaces.
This commit is contained in:
@@ -52,19 +52,19 @@ return {
|
||||
|
||||
if (options.method === 'read_group') {
|
||||
if (!(params.args && params.args[0] !== undefined)) {
|
||||
params.kwargs.domain = options.domain || params.domain || params.kwargs.domain || [];
|
||||
params.kwargs.domain = options.domain || params.domain || params.kwargs.domain || [];
|
||||
}
|
||||
if (!(params.args && params.args[1] !== undefined)) {
|
||||
params.kwargs.fields = options.fields || params.fields || params.kwargs.fields || [];
|
||||
params.kwargs.fields = options.fields || params.fields || params.kwargs.fields || [];
|
||||
}
|
||||
if (!(params.args && params.args[2] !== undefined)) {
|
||||
params.kwargs.groupby = options.groupBy || params.groupBy || params.kwargs.groupby || [];
|
||||
params.kwargs.groupby = options.groupBy || params.groupBy || params.kwargs.groupby || [];
|
||||
}
|
||||
params.kwargs.offset = options.offset || params.offset || params.kwargs.offset;
|
||||
params.kwargs.limit = options.limit || params.limit || params.kwargs.limit;
|
||||
params.kwargs.offset = options.offset || params.offset || params.kwargs.offset;
|
||||
params.kwargs.limit = options.limit || params.limit || params.kwargs.limit;
|
||||
// In kwargs, we look for "orderby" rather than "orderBy" (note the absence of capital B),
|
||||
// since the Python argument to the actual function is "orderby".
|
||||
var orderBy = options.orderBy || params.orderBy || params.kwargs.orderby;
|
||||
var orderBy = options.orderBy || params.orderBy || params.kwargs.orderby;
|
||||
params.kwargs.orderby = orderBy ? this._serializeSort(orderBy) : orderBy;
|
||||
params.kwargs.lazy = 'lazy' in options ? options.lazy : params.lazy;
|
||||
}
|
||||
@@ -72,7 +72,7 @@ return {
|
||||
if (options.method === 'search_read') {
|
||||
// call the model method
|
||||
params.kwargs.domain = options.domain || params.domain || params.kwargs.domain;
|
||||
params.kwargs.fields = options.fields || params.fields || params.kwargs.fields;
|
||||
params.kwargs.fields = options.fields || params.fields || params.kwargs.fields;
|
||||
params.kwargs.offset = options.offset || params.offset || params.kwargs.offset;
|
||||
params.kwargs.limit = options.limit || params.limit || params.kwargs.limit;
|
||||
// In kwargs, we look for "order" rather than "orderBy" since the Python
|
||||
|
||||
@@ -306,7 +306,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
|
||||
*
|
||||
* @private
|
||||
*/
|
||||
_disableButtons: function () {
|
||||
_disableButtons: function () {
|
||||
if (this.$buttons) {
|
||||
this.$buttons.find('button').attr('disabled', true);
|
||||
}
|
||||
@@ -352,7 +352,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
|
||||
*
|
||||
* @private
|
||||
*/
|
||||
_enableButtons: function () {
|
||||
_enableButtons: function () {
|
||||
if (this.$buttons) {
|
||||
this.$buttons.find('button').removeAttr('disabled');
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ QUnit.module('upgrade_fields', {
|
||||
"the upgrade label shouldn't be inside the field section");
|
||||
assert.strictEqual(form.$('.o_label .label').length, 1,
|
||||
"the upgrade label should be inside the label section");
|
||||
assert.strictEqual(form.$('.o_label').text(), "Bar EnterpriseCoucou",
|
||||
assert.strictEqual(form.$('.o_label').text(), "Bar EnterpriseCoucou",
|
||||
"the upgrade label should be inside the label section");
|
||||
form.destroy();
|
||||
});
|
||||
|
||||
@@ -792,7 +792,7 @@ var MockServer = Class.extend({
|
||||
var result = this._mockSearchReadController({
|
||||
model: model,
|
||||
domain: kwargs.domain || args[0],
|
||||
fields: kwargs.fields || args[1],
|
||||
fields: kwargs.fields || args[1],
|
||||
offset: kwargs.offset || args[2],
|
||||
limit: kwargs.limit || args[3],
|
||||
order: kwargs.order || args[4],
|
||||
|
||||
Reference in New Issue
Block a user