Merge lp:~openerp-dev/openerp-web/7.0-bug-1095919-psa into lp:openerp-web/7.0

[Paramjit Singh Sahota(OpenERP)]

Hello,

Fixed the issue,
>[7.0]Modules:Apps and Modules:Updates emit error, "TypeError: ClientWidget is null"

Thankz YoU.
 -PSA.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

What is the actual bug, what is the problem, and why are you essentially reverting <email address hidden> ?

review: Needs Information

[Paramjit Singh Sahota(OpenERP) (psa-openerp)]

> What is the actual bug, what is the problem, and why are you essentially
> reverting <email address hidden> ?

Hello,
When I fixed this bug at that time this error exists when we click on the Apps
and at that time the menu where like this

> Installed Modules
> Apps
> Updates

And when we click on APPS it is showing the error msg as below:

>>>> Uncaught TypeError: Cannot read property 'lang' of undefined

Bcz at that time the APPS button is showing the APPS from the https://apps.openerp.com
but now i think that this feature has been removed so itz not showing that error.

Unmerged revisions

3685. By Paramjit Singh Sahota(OpenERP) on 2013-01-07

[IMP]Improved code.

3684. By Paramjit Singh Sahota(OpenERP) on 2013-01-07

[MERGE] Merged lp:openerp-web/7.0

3683. By Paramjit Singh Sahota(OpenERP) on 2013-01-04

[FIX][7.0]Modules:Apps and Modules:Updates emit error, 'TypeError: ClientWidget is null'

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2012-12-26 18:18:33 +0000
+++ addons/web/controllers/main.py	2013-01-07 11:06:22 +0000
@@ -797,9 +797,9 @@
         return {
             "session_id": req.session_id,
             "uid": req.session._uid,
-            "user_context": req.session.get_context() if req.session._uid else {},
+            "context": req.session.get_context() if req.session._uid else {},
             "db": req.session._db,
-            "username": req.session._login,
+            "login": req.session._login,
         }
 
     @openerpweb.jsonrequest

=== modified file 'addons/web/static/src/js/coresetup.js'
--- addons/web/static/src/js/coresetup.js	2012-12-27 07:44:38 +0000
+++ addons/web/static/src/js/coresetup.js	2013-01-07 11:06:22 +0000
@@ -85,7 +85,13 @@
             // 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, result);
+            _.extend(self, {
+                session_id: result.session_id,
+                db: result.db,
+                username: result.login,
+                uid: result.uid,
+                user_context: result.context
+            });
         });
     },
     session_is_valid: function() {
@@ -102,7 +108,13 @@
             if (!result.uid) {
                 return $.Deferred().reject();
             }
-            _.extend(self, result);
+            _.extend(self, {
+                session_id: result.session_id,
+                db: result.db,
+                username: result.login,
+                uid: result.uid,
+                user_context: result.context
+            });
             if (!_volatile) {
                 self.set_cookie('session_id', self.session_id);
             }