[MERGE] forward port of branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf

bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02 bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b
author: Christophe Simonis <chs@openerp.com> 2013-06-13 19:39:00 +0200
committer: Christophe Simonis <chs@openerp.com> 2013-06-13 19:39:00 +0200
commit: a61e7cb0c80ae773cab9753bd8a4e7e888bbf415 (patch)
tree: 019a235869a5e087055700895d4584c80e2f9afb /addons/web_graph
parent: 5ed0ac2614b9430e61dae472d657a21c037d6ee9 (diff)
parent: 180e6e41d81e28df43b41e3cb6131225d4169a28 (diff)
3 files changed, 58 insertions, 57 deletions
diff --git a/addons/web_graph/static/lib/flotr2/lib/canvastext.js b/addons/web_graph/static/lib/flotr2/lib/canvastext.js
index 3266729f6a6..2df45bae0d8 100644
--- a/addons/web_graph/static/lib/flotr2/lib/canvastext.js
+++ b/addons/web_graph/static/lib/flotr2/lib/canvastext.js
@@ -1,7 +1,7 @@
 /**
  * This code is released to the public domain by Jim Studt, 2007.
  * He may keep some sort of up to date copy at http://www.federated.com/~jim/canvastext/
- * It as been modified by Fabien Mйnager to handle font style like size, weight, color and rotation. 
+ * It as been modified by Fabien MГ©nager to handle font style like size, weight, color and rotation. 
  * A partial support for special characters has been added too.
  */
 var CanvasText = {
@@ -108,71 +108,71 @@ var CanvasText = {
     '~': { width: 24, points: [[3,6],[3,8],[4,11],[6,12],[8,12],[10,11],[14,8],[16,7],[18,7],[20,8],[21,10],null,[3,8],[4,10],[6,11],[8,11],[10,10],[14,7],[16,6],[18,6],[20,7],[21,10],[21,12]] },
     
     // Lower case Latin-1
-    'а': { diacritic: '`', letter: 'a' },
-    'б': { diacritic: 'ґ', letter: 'a' },
-    'в': { diacritic: '^', letter: 'a' },
-    'д': { diacritic: 'Ё', letter: 'a' },
-    'г': { diacritic: '~', letter: 'a' },
+    'Г ': { diacritic: '`', letter: 'a' },
+    'ГЎ': { diacritic: 'Вґ', letter: 'a' },
+    'Гў': { diacritic: '^', letter: 'a' },
+    'Г¤': { diacritic: 'ВЁ', letter: 'a' },
+    'ГЈ': { diacritic: '~', letter: 'a' },
     
-    'и': { diacritic: '`', letter: 'e' },
-    'й': { diacritic: 'ґ', letter: 'e' },
-    'к': { diacritic: '^', letter: 'e' },
-    'л': { diacritic: 'Ё', letter: 'e' },
+    'ГЁ': { diacritic: '`', letter: 'e' },
+    'Г©': { diacritic: 'Вґ', letter: 'e' },
+    'ГЄ': { diacritic: '^', letter: 'e' },
+    'Г«': { diacritic: 'ВЁ', letter: 'e' },
     
-    'м': { diacritic: '`', letter: 'i' },
-    'н': { diacritic: 'ґ', letter: 'i' },
-    'о': { diacritic: '^', letter: 'i' },
-    'п': { diacritic: 'Ё', letter: 'i' },
+    'Г¬': { diacritic: '`', letter: 'i' },
+    'Г': { diacritic: 'Вґ', letter: 'i' },
+    'Г®': { diacritic: '^', letter: 'i' },
+    'ГЇ': { diacritic: 'ВЁ', letter: 'i' },
     
-    'т': { diacritic: '`', letter: 'o' },
-    'у': { diacritic: 'ґ', letter: 'o' },
-    'ф': { diacritic: '^', letter: 'o' },
-    'ц': { diacritic: 'Ё', letter: 'o' },
-    'х': { diacritic: '~', letter: 'o' },
+    'ГІ': { diacritic: '`', letter: 'o' },
+    'Гі': { diacritic: 'Вґ', letter: 'o' },
+    'Гґ': { diacritic: '^', letter: 'o' },
+    'Г¶': { diacritic: 'ВЁ', letter: 'o' },
+    'Гµ': { diacritic: '~', letter: 'o' },
 
-    'щ': { diacritic: '`', letter: 'u' },
-    'ъ': { diacritic: 'ґ', letter: 'u' },
-    'ы': { diacritic: '^', letter: 'u' },
-    'ь': { diacritic: 'Ё', letter: 'u' },
+    'Г№': { diacritic: '`', letter: 'u' },
+    'Гє': { diacritic: 'Вґ', letter: 'u' },
+    'Г»': { diacritic: '^', letter: 'u' },
+    'Гј': { diacritic: 'ВЁ', letter: 'u' },
     
-    'э': { diacritic: 'ґ', letter: 'y' },
-    'я': { diacritic: 'Ё', letter: 'y' },
+    'ГЅ': { diacritic: 'Вґ', letter: 'y' },
+    'Гї': { diacritic: 'ВЁ', letter: 'y' },
     
-    'з': { diacritic: 'ё', letter: 'c' },
-    'с': { diacritic: '~', letter: 'n' },
+    'Г§': { diacritic: 'Вё', letter: 'c' },
+    'Г±': { diacritic: '~', letter: 'n' },
 
     // Upper case Latin-1
-    'А': { diacritic: '`', letter: 'A' },
-    'Б': { diacritic: 'ґ', letter: 'A' },
-    'В': { diacritic: '^', letter: 'A' },
-    'Д': { diacritic: 'Ё', letter: 'A' },
-    'Г': { diacritic: '~', letter: 'A' },
+    'ГЂ': { diacritic: '`', letter: 'A' },
+    'ГЃ': { diacritic: 'Вґ', letter: 'A' },
+    'Г‚': { diacritic: '^', letter: 'A' },
+    'Г„': { diacritic: 'ВЁ', letter: 'A' },
+    'Гѓ': { diacritic: '~', letter: 'A' },
     
-    'И': { diacritic: '`', letter: 'E' },
-    'Й': { diacritic: 'ґ', letter: 'E' },
-    'К': { diacritic: '^', letter: 'E' },
-    'Л': { diacritic: 'Ё', letter: 'E' },
+    'Г€': { diacritic: '`', letter: 'E' },
+    'Г‰': { diacritic: 'Вґ', letter: 'E' },
+    'ГЉ': { diacritic: '^', letter: 'E' },
+    'Г‹': { diacritic: 'ВЁ', letter: 'E' },
 
-    'М': { diacritic: '`', letter: 'I' },
-    'Н': { diacritic: 'ґ', letter: 'I' },
-    'О': { diacritic: '^', letter: 'I' },
-    'П': { diacritic: 'Ё', letter: 'I' },
+    'ГЊ': { diacritic: '`', letter: 'I' },
+    'ГЌ': { diacritic: 'Вґ', letter: 'I' },
+    'ГЋ': { diacritic: '^', letter: 'I' },
+    'ГЏ': { diacritic: 'ВЁ', letter: 'I' },
     
-    'Т': { diacritic: '`', letter: 'O' },
-    'У': { diacritic: 'ґ', letter: 'O' },
-    'Ф': { diacritic: '^', letter: 'O' },
-    'Ц': { diacritic: 'Ё', letter: 'O' },
-    'Х': { diacritic: '~', letter: 'O' },
+    'Г’': { diacritic: '`', letter: 'O' },
+    'Г“': { diacritic: 'Вґ', letter: 'O' },
+    'Г”': { diacritic: '^', letter: 'O' },
+    'Г–': { diacritic: 'ВЁ', letter: 'O' },
+    'Г•': { diacritic: '~', letter: 'O' },
     
-    'Щ': { diacritic: '`', letter: 'U' },
-    'Ъ': { diacritic: 'ґ', letter: 'U' },
-    'Ы': { diacritic: '^', letter: 'U' },
-    'Ь': { diacritic: 'Ё', letter: 'U' },
+    'Г™': { diacritic: '`', letter: 'U' },
+    'Гљ': { diacritic: 'Вґ', letter: 'U' },
+    'Г›': { diacritic: '^', letter: 'U' },
+    'Гњ': { diacritic: 'ВЁ', letter: 'U' },
     
-    'Э': { diacritic: 'ґ', letter: 'Y' },
+    'Гќ': { diacritic: 'Вґ', letter: 'Y' },
     
-    'З': { diacritic: 'ё', letter: 'C' },
-    'С': { diacritic: '~', letter: 'N' }
+    'Г‡': { diacritic: 'Вё', letter: 'C' },
+    'Г‘': { diacritic: '~', letter: 'N' }
   },
   
   specialchars: {
@@ -181,11 +181,11 @@ var CanvasText = {
   
   /** Diacritics, used to draw accentuated letters */
   diacritics: {
-    'ё': { entity: 'cedil', points: [[6,-4],[4,-6],[2,-7],[1,-7]] },
-    'ґ': { entity: 'acute', points: [[8,19],[13,22]] },
+    'Вё': { entity: 'cedil', points: [[6,-4],[4,-6],[2,-7],[1,-7]] },
+    'Вґ': { entity: 'acute', points: [[8,19],[13,22]] },
     '`': { entity: 'grave', points: [[7,22],[12,19]] },
     '^': { entity: 'circ',  points: [[5.5,19],[9.5,23],[12.5,19]] },
-    'Ё': { entity: 'trema', points: [[5,21],[6,20],[7,21],[6,22],[5,21],null,[12,21],[13,20],[14,21],[13,22],[12,21]] },
+    'ВЁ': { entity: 'trema', points: [[5,21],[6,20],[7,21],[6,22],[5,21],null,[12,21],[13,20],[14,21],[13,22],[12,21]] },
     '~': { entity: 'tilde', points: [[4,18],[7,22],[10,18],[13,22]] }
   },
   
diff --git a/addons/web_graph/static/lib/flotr2/lib/jasmine/jasmine_favicon.png b/addons/web_graph/static/lib/flotr2/lib/jasmine/jasmine_favicon.png
index 218f3b43713..bd147955254 100644
--- a/addons/web_graph/static/lib/flotr2/lib/jasmine/jasmine_favicon.png
+++ b/addons/web_graph/static/lib/flotr2/lib/jasmine/jasmine_favicon.png
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js
index 8710b840209..a84bb53fc85 100644
--- a/addons/web_graph/static/src/js/graph.js
+++ b/addons/web_graph/static/src/js/graph.js
@@ -5,6 +5,7 @@
 openerp.web_graph = function (instance) {
 
 var _lt = instance.web._lt;
+var _t = instance.web._t;
 
 // removed ``undefined`` values
 var filter_values = function (o) {
@@ -343,7 +344,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
                     var defs = [];
                     _.each(axis, function(x) {
                         var key = x[xaxis[0]]
-                        defs.push(obj.call("read_group", [domain, yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).then(function(res) {
+                        defs.push(obj.call("read_group", [x['__domain'], yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).then(function(res) {
                             return [x, key, res];
                         }));
                     });
@@ -365,7 +366,7 @@ instance.web_graph.GraphView = instance.web.View.extend({
         }).then(function() {
             var res = {
                 'data': result,
-                'ticks': _.map(ticks, function(el, key) { return [el, key] })
+                'ticks': _.map(ticks, function(el, key) { return [el, key || _t("Undefined")] })
             };
             return res;
         }));
author	Christophe Simonis <chs@openerp.com>	2013-06-13 19:39:00 +0200
committer	Christophe Simonis <chs@openerp.com>	2013-06-13 19:39:00 +0200
commit	a61e7cb0c80ae773cab9753bd8a4e7e888bbf415 (patch)
tree	019a235869a5e087055700895d4584c80e2f9afb /addons/web_graph
parent	5ed0ac2614b9430e61dae472d657a21c037d6ee9 (diff)
parent	180e6e41d81e28df43b41e3cb6131225d4169a28 (diff)