summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-05-05 18:48:34 +0200
committerChristophe Simonis <chs@odoo.com>2015-05-05 18:48:34 +0200
commit22604968793a7cc12c8fcf89411ba5b79c0642b3 (patch)
tree7332814024d0a8f872e726b4f907020cc3a6a341 /addons/web/static/src/js
parent28b5d0da0d05b2f4cd68ffbd39288f9f01c8f57f (diff)
parenta939a272efa7cdd047e79a0a6da361e94ca93d4f (diff)
[MERGE] forward port of branch 8.0 up to a939a27
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/chrome.js2
-rw-r--r--addons/web/static/src/js/search.js4
-rw-r--r--addons/web/static/src/js/tour.js8
-rw-r--r--addons/web/static/src/js/view_graph.js1
4 files changed, 13 insertions, 2 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 8eabafb5f2d..c2f65985222 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1165,7 +1165,7 @@ instance.web.UserMenu = instance.web.Widget.extend({
instance.web.redirect('https://accounts.odoo.com/oauth2/auth?'+$.param(params));
}).fail(function(result, ev){
ev.preventDefault();
- instance.web.redirect('https://accounts.odoo.com/web');
+ instance.web.redirect('https://accounts.odoo.com/account');
});
}
},
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 4af14090056..40b4410871f 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -2060,6 +2060,10 @@ instance.web.search.ExtendedSearchProposition.Float = instance.web.search.Extend
{value: "∃", text: _lt("is set")},
{value: "∄", text: _lt("is not set")}
],
+ init: function (parent) {
+ this._super(parent);
+ this.decimal_point = instance.web._t.database.parameters.decimal_point;
+ },
toString: function () {
return this.$el.val();
},
diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 3fc2536581d..f152506fcf1 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -68,6 +68,7 @@ var localStorage = window.localStorage;
var Tour = {
tours: {},
defaultDelay: 50,
+ autoRunning: true,
retryRunningDelay: 1000,
errorDelay: 5000,
state: null,
@@ -369,6 +370,7 @@ var Tour = {
},
logError: function (step, message, all) {
var state = Tour.getState();
+ console.log(state.tour.steps.slice());
message += '\ntour: ' + state.id
+ (step ? '\nstep: ' + step.id + ": '" + (step._title || step.title) + "'" : '' )
+ (all ? '\nhref: ' + window.location.href : '' )
@@ -690,6 +692,10 @@ openerp.Tour = Tour;
/////////////////////////////////////////////////
-$(document).ready(Tour.running);
+$(document).ready(function () {
+ if (Tour.autoRunning) {
+ Tour.running();
+ };
+});
}());
diff --git a/addons/web/static/src/js/view_graph.js b/addons/web/static/src/js/view_graph.js
index 13361c6bab1..d5c6bbad69a 100644
--- a/addons/web/static/src/js/view_graph.js
+++ b/addons/web/static/src/js/view_graph.js
@@ -283,6 +283,7 @@ instance.web.GraphWidget = instance.web.Widget.extend({
// rotateLabels: 40,
showControls: (this.groupbys.length > 1)
});
+ chart.yAxis.tickFormat(function(d) { return openerp.web.format_value(d, { type : 'float' });});
chart(svg);
this.to_remove = chart.update;