Merge lp:~openerp-dev/openerp-web/7.0-anonymous_lang-vta into lp:openerp-web/7.0

[Victor Tabuenca (OpenERP)]

Make browser's lang the anonymous user language

[lp:~openerp-dev/openerp-web/7.0-anonymous_lang-vta]

3663. By vta <email address hidden> on 2012-12-27

[FIX] Spacing

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2012-12-19 15:45:05 +0000
+++ addons/web/controllers/main.py	2012-12-27 07:46:22 +0000
@@ -668,7 +668,7 @@
         messages = ir_translation.search_read([('module','in',mods),('lang','=',lang),
                                                ('comments','like','openerp-web'),('value','!=',False),
                                                ('value','!=','')],
-                                              ['module','src','value','lang'], order='module') 
+                                              ['module','src','value','lang'], order='module')
         for mod, msg_group in itertools.groupby(messages, key=operator.itemgetter('module')):
             translations_per_module.setdefault(mod,{'messages':[]})
             translations_per_module[mod]['messages'].extend({'id': m['src'],
@@ -797,9 +797,9 @@
         return {
             "session_id": req.session_id,
             "uid": req.session._uid,
-            "context": req.session.get_context() if req.session._uid else {},
+            "user_context": req.session.get_context() if req.session._uid else {},
             "db": req.session._db,
-            "login": req.session._login,
+            "username": req.session._login,
         }
 
     @openerpweb.jsonrequest
@@ -1072,7 +1072,7 @@
     @openerpweb.jsonrequest
     def call(self, req, model, method, args, domain_id=None, context_id=None):
         return self._call_kw(req, model, method, args, {})
-    
+
     @openerpweb.jsonrequest
     def call_kw(self, req, model, method, args, kwargs):
         return self._call_kw(req, model, method, args, kwargs)
@@ -1186,7 +1186,7 @@
                     if width > 500: width = 500
                     if height > 500: height = 500
                     image_base64 = openerp.tools.image_resize_image(base64_source=image_base64, size=(width, height), encoding='base64', filetype='PNG')
-            
+
             image_data = base64.b64decode(image_base64)
 
         except (TypeError, xmlrpclib.Fault):
@@ -1468,7 +1468,7 @@
         fields = self.fields_get(req, model)
         if ".id" in export_fields:
             fields['.id'] = fields.pop('id', {'string': 'ID'})
-            
+
         # To make fields retrieval more efficient, fetch all sub-fields of a
         # given field at the same time. Because the order in the export list is
         # arbitrary, this requires ordering all sub-fields of a given field

=== modified file 'addons/web/session.py'
--- addons/web/session.py	2012-12-17 10:01:27 +0000
+++ addons/web/session.py	2012-12-27 07:46:22 +0000
@@ -22,7 +22,7 @@
     def __init__(self, session, service_name):
         self.session = session
         self.service_name = service_name
-        
+
     def __getattr__(self, method):
         def proxy_method(*args):
             result = self.session.send(self.service_name, method, *args)
@@ -60,7 +60,7 @@
     in a web session.
 
     .. attribute:: context
-    
+
         The session context, a ``dict``. Can be reloaded by calling
         :meth:`openerpweb.openerpweb.OpenERPSession.get_context`
 
@@ -80,7 +80,7 @@
         self._suicide = False
         self.context = {}
         self.jsonp_requests = {}     # FIXME use a LRU
-        
+
     def send(self, service_name, method, *args):
         code_string = "warning -- %s\n\n%s"
         try:
@@ -112,7 +112,7 @@
     def authenticate(self, db, login, password, env=None):
         uid = self.proxy('common').authenticate(db, login, password, env)
         self.bind(db, uid, login, password)
-        
+
         if uid: self.get_context()
         return uid
 

=== modified file 'addons/web/static/src/js/corelib.js'
--- addons/web/static/src/js/corelib.js	2012-11-30 10:36:51 +0000
+++ addons/web/static/src/js/corelib.js	2012-12-27 07:46:22 +0000
@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2012, OpenERP S.A.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met: 
- * 
+ * modification, are permitted provided that the following conditions are met:
+ *
  * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer. 
+ *    list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution. 
- * 
+ *    and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -243,7 +243,7 @@
 
 /**
  * Backbone's events. Do not ever use it directly, use EventDispatcherMixin instead.
- * 
+ *
  * This class just handle the dispatching of events, it is not meant to be extended,
  * nor used directly. All integration with parenting and automatic unregistration of
  * events is done in EventDispatcherMixin.
@@ -303,7 +303,7 @@
         });
         return lst;
     },
-    
+
     trigger : function(events) {
         var event, node, calls, tail, args, all, rest;
         if (!(calls = this._callbacks))
@@ -1043,7 +1043,7 @@
             id: payload.id,
             sid: this.httpsessionid,
         };
-        
+
         var set_sid = function (response, textStatus, jqXHR) {
             // If response give us the http session id, we store it for next requests...
             if (response.httpsessionid) {
@@ -1054,7 +1054,7 @@
         url.url = this.url(url.url, null);
         var ajax = _.extend({
             type: "GET",
-            dataType: 'jsonp', 
+            dataType: 'jsonp',
             jsonp: 'jsonp',
             cache: false,
             data: data

=== modified file 'addons/web/static/src/js/coresetup.js'
--- addons/web/static/src/js/coresetup.js	2012-12-19 15:12:17 +0000
+++ addons/web/static/src/js/coresetup.js	2012-12-27 07:46:22 +0000
@@ -49,7 +49,6 @@
         _(this.module_list).each(function (mod) {
             self.module_loaded[mod] = true;
         });
-        this.context = {};
         this.active_id = null;
         return this.session_init();
     },
@@ -67,7 +66,7 @@
                 return deferred.then(function() { return self.load_modules(); });
             }
             return $.when(
-                    deferred, 
+                    deferred,
                     self.rpc('/web/webclient/bootstrap_translations', {mods: instance._modules}).then(function(trans) {
                         instance.web._t.database.set_bundle(trans);
                     })
@@ -86,13 +85,7 @@
             // If immediately follows a login (triggered by trying to restore
             // an invalid session or no session at all), refresh session data
             // (should not change, but just in case...)
-            _.extend(self, {
-                session_id: result.session_id,
-                db: result.db,
-                username: result.login,
-                uid: result.uid,
-                user_context: result.context
-            });
+            _.extend(self, result);
         });
     },
     session_is_valid: function() {
@@ -109,14 +102,7 @@
             if (!result.uid) {
                 return $.Deferred().reject();
             }
-
-            _.extend(self, {
-                session_id: result.session_id,
-                db: result.db,
-                username: result.login,
-                uid: result.uid,
-                user_context: result.context
-            });
+            _.extend(self, result);
             if (!_volatile) {
                 self.set_cookie('session_id', self.session_id);
             }