From f2139f9603d7edef6355c8ae933508b142ca5eae Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 18 Jan 2011 20:30:22 +0100
Subject: [PATCH] [FIX] share: user m2m for selecting existing users instead of
 o2m

bzr revid: odo@openerp.com-20110118193022-van29r1hs7qcppng
---
 addons/share/wizard/share_wizard.py       | 17 ++++-------------
 addons/share/wizard/share_wizard_view.xml |  6 +-----
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 698a6b601cb..48243c57dda 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -56,7 +56,7 @@ class share_create(osv.osv_memory):
         'domain': fields.char('Domain', size=256, help="Optional domain for further data filtering"),
         'user_type': fields.selection([('existing','Existing external users'),('new','New users (emails required)')],'Users to share with',
                 help="Select the type of user(s) you would like to share data with."),
-        'user_ids': fields.one2many('share.wizard.user', 'share_wizard_id', 'Users'),
+        'user_ids': fields.many2many('res.users', 'share_wizard_res_user_rel', 'share_id', 'user_id', 'Existing users', domain=[('share', '=', True)]),
         'new_users': fields.text("New users"),
         'access_mode': fields.selection([('readwrite','Read & Write'),('readonly','Read-only')],'Access Mode'),
         'result_line_ids': fields.one2many('share.wizard.result.line', 'share_wizard_id', 'Summary', readonly=True),
@@ -339,12 +339,12 @@ class share_create(osv.osv_memory):
             # existing users
             for user in wizard_data.user_ids:
                 share_url = share_root_url % \
-                        {'login': user.user_id.login,
+                        {'login': user.login,
                          'password': '',
                          'dbname': cr.dbname} if format_url else share_root_url
                 result_obj.create(cr, uid, {
                         'share_wizard_id': wizard_data.id,
-                        'login': user.user_id.login,
+                        'login': user.login,
                         'password': existing_passwd_str,
                         'share_url': share_url,
                         'newly_created': False,
@@ -363,7 +363,7 @@ class share_create(osv.osv_memory):
         if wizard_data.user_type == 'new':
             user_ids = self._create_new_share_users(cr, uid, wizard_data, group_id, context=context)
         else:
-            user_ids = [x.user_id.id for x in wizard_data.user_ids]
+            user_ids = [x.id for x in wizard_data.user_ids]
             # reset home action to regular menu as user needs access to multiple items
             user_obj.write(cr, 1, user_ids, {
                                    'groups_id': [(4,group_id)],
@@ -471,15 +471,6 @@ class share_create(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
 share_create()
 
-class share_user_ref(osv.osv_memory):
-    _name = 'share.wizard.user'
-    _rec_name = 'user_id'
-    _columns = {
-        'user_id': fields.many2one('res.users', 'Users', required=True, domain=[('share', '=', True)]),
-        'share_wizard_id': fields.many2one('share.wizard', 'Share Wizard', required=True), 
-    }
-share_user_ref()
-
 class share_result_line(osv.osv_memory):
     _name = 'share.wizard.result.line'
     _rec_name = 'login'
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 95fbc983c84..bd281c7e97a 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -33,11 +33,7 @@
                     <field name="user_type"/>
                     <group colspan="4" attrs="{'invisible':[('user_type','!=','existing')]}">
                         <separator colspan="4" string="Existing External Users"/>
-                        <field colspan="4" nolabel="1" name="user_ids" mode="tree">
-                            <tree editable="bottom" string="">
-                                <field name="user_id"/>
-                            </tree>
-                        </field>
+                        <field colspan="4" nolabel="1" name="user_ids" mode="tree"/>
                     </group>
                     <group colspan="4" attrs="{'invisible':[('user_type','!=','new')]}">
                         <separator colspan="4" string="New Users (please provide one e-mail address per line below)"/>