Merge lp:~acsone-openerp/web-addons/bug-1303944-sbi into lp:~webaddons-core-editors/web-addons/7.0

[Stéphane Bidoul (Acsone)]

[FIX] web_easy_switch_company: propose the correct companies to non-admin users

Emulate the exact behaviour of the stock user preferences form.

[lp:~acsone-openerp/web-addons/bug-1303944-sbi]

32. By Stéphane Bidoul (Acsone) on 2014-04-18

Added a comment about an issue with the logos

[arthru (arthru)]

Tested with admin and non admin users.

review: Approve (tested)

[Stéphane Bidoul (Acsone) (sbi)]

Note: logos do not display correctely, and, as far as I can tell, there is no way to make this work with the default record rule.

[Sylvain LE GAL (GRAP) (sylvain-legal)]

LGTM.

Sorry for the late.

+++

review: Approve (code review, test)

[Stéphane Bidoul (Acsone) (sbi)]

Hi Sylvain, thanks for the review.

What do you think about the logos. In practice they don't display properly with non admin users and I see no way out of that. Should we remove them?

-sbi

[Sylvain LE GAL (GRAP) (sylvain-legal)]

Hi Stéphane,

I don't have a precise idea about that.
I'm pretty in favor to keep that feature because :
- it works for admin user and doesn't bug with non-admin users;
- It works if admin user decide to change default ACL;

I'm agree : it's not very clean. (but OpenERP Core is not very clean in that case...)

Other point of you ?

Regards.

[Stéphane Bidoul (Acsone) (sbi)]

I'm fine with your view. It does not crash indeed and users don't complain. So let's keep it that way for now.

Thanks again for this neat module!

-sbi

[Pedro Manuel Baeza (pedro.baeza)]

I have tried and it works good for admin and non admin users. It's a pity the logos issue, but module is very good even with that!

Regards

review: Approve (code review and test)

=== modified file 'web_easy_switch_company/static/src/js/switch_company.js'
--- web_easy_switch_company/static/src/js/switch_company.js	2014-04-02 09:17:53 +0000
+++ web_easy_switch_company/static/src/js/switch_company.js	2014-04-18 10:09:50 +0000
@@ -92,25 +92,41 @@
         _load_data: function(){
             var self = this;
             // Request for current users information
-            this._fetch('res.users',['company_id','company_ids'],[['id','=',this.session.uid]]).then(function(res_users){
+            this._fetch('res.users',['company_id'],[['id','=',this.session.uid]]).then(function(res_users){
                 self.current_company_id = res_users[0].company_id[0];
                 self.current_company_name = res_users[0].company_id[1];
                 // Request for other companies
-                self._fetch('res.company',['name',],[['id','in', res_users[0].company_ids]]).then(function(res_company){
+                // We have to go through fields_view_get to emulate the
+                // exact (exotic) behavior of the user preferences form in 
+                // fetching the allowed companies wrt record rules.
+                // Note: calling res.company.name_search with 
+                //       user_preference=True in the context does 
+                //       not work either.
+                new instance.web.Model('res.users').call('fields_view_get',{context:{'form_view_ref':'base.view_users_form_simple_modif'}}).then(function(res){
+                    var res_company = res.fields.company_id.selection;
                     for ( var i=0 ; i < res_company.length; i++) {
-                        res_company[i]['logo_topbar'] = self.session.url(
+                        var logo_topbar, logo_state;
+                        // TODO: fetching the logo of other companies fails with the
+                        //       default res.company record rule, so we should
+                        //       probably remove the logos from the menu :(
+                        logo_topbar = self.session.url(
                             '/web/binary/image', {
                                 model:'res.company', 
                                 field: 'logo_topbar', 
-                                id: res_company[i].id
+                                id: res_company[i][0]
                             });
-                        if (res_company[i].id == self.current_company_id){
-                            res_company[i]['logo_state'] = '/web_easy_switch_company/static/src/img/selection-on.png';
+                        if (res_company[i][0] == self.current_company_id){
+                            logo_state = '/web_easy_switch_company/static/src/img/selection-on.png';
                         }
                         else{
-                            res_company[i]['logo_state'] = '/web_easy_switch_company/static/src/img/selection-off.png';
+                            logo_state = '/web_easy_switch_company/static/src/img/selection-off.png';
                         }
-                        self.companies.push(res_company[i]);
+                        self.companies.push({
+                            id: res_company[i][0],
+                            name: res_company[i][1],
+                            logo_topbar: logo_topbar,
+                            logo_state: logo_state
+                        });
                     }
                     // Update rendering
                     self.renderElement();