From 112426bb5b45aefc32120f6d29e25b33d6e9b9f3 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 25 Jan 2013 14:42:21 +0100 Subject: [PATCH 01/14] [IMP] res_user: change view form bzr revid: chm@openerp.com-20130125134221-cxysx6qoik3nz3p4 --- openerp/addons/base/res/res_users_view.xml | 69 ++++++++-------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 7e83b43179f..33149f918a3 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -84,51 +84,7 @@ - - - res.users.simplified.form - res.users - 1 - -
- - -
-
-
-

- -

- -
- - - - - - - - - - - -
- - res.users.form res.users @@ -155,8 +111,30 @@ - + + + + + + + + + + + + @@ -169,7 +147,6 @@ - From b7fe7956c503d76eb85323ea083359be37ce22d5 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 28 Jan 2013 11:23:08 +0100 Subject: [PATCH 02/14] [IMP] res_user: view and simple_mode view (hide notebook when simple_mode is in the context) bzr revid: chm@openerp.com-20130128102308-xwp0rl1jx93l1dwr --- openerp/addons/base/res/res_users_view.xml | 42 +++++++--------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 33149f918a3..1c858bbc994 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -92,7 +92,7 @@
-
+
@@ -102,37 +102,16 @@

- - - - - - - - - + - - - - - - - - - + + + + + @@ -151,6 +130,9 @@ + + + From 7d3bf223471c7c9e36376ba2f1c6095ab967446a Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 28 Jan 2013 14:30:03 +0100 Subject: [PATCH 03/14] [IMP] res_user: we can add 'default_groups_ref' inside the context to set default value for group_id with xml values bzr revid: chm@openerp.com-20130128133003-rl1xem6hqhlkh621 --- openerp/addons/base/res/res_users.py | 13 +++++++++++++ openerp/addons/base/res/res_users_view.xml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index df83f0ac1e3..e3806643c28 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -778,6 +778,19 @@ class users_view(osv.osv): values['groups_id'] = [(3, id) for id in remove] + [(4, id) for id in add] def default_get(self, cr, uid, fields, context=None): + # add "default_groups_ref" inside the context to set default value for group_id with xml values + if context.get("default_groups_ref", None) and isinstance(context.get("default_groups_ref"), list): + context['default_groups_id'] = [] + ir_model_data = self.pool.get('ir.model.data') + for group in context.get("default_groups_ref"): + group_split = group.split('.') + if len(group_split) != 2 or \ + not group_split[0] or not isinstance(group_split[0], (str, unicode, basestring)) or \ + not group_split[1] or not isinstance(group_split[1], (str, unicode, basestring)): + raise osv.except_osv(_('Invalid context value'), _('Invalid context default_groups_ref value (model.name_id) : "%s"') % group) + model_data_ids = ir_model_data.search(cr, SUPERUSER_ID, [('model', '=', 'res.groups'), ('module', '=', group_split[0]), ('name', '=', group_split[1])]) + context['default_groups_id'] += [group_data['res_id'] for group_data in ir_model_data.read(cr, SUPERUSER_ID, model_data_ids, ['res_id'])] + group_fields, fields = partition(is_reified_group, fields) fields1 = (fields + ['groups_id']) if group_fields else fields values = super(users_view, self).default_get(cr, uid, fields1, context) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 1c858bbc994..9d6b334e180 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -125,7 +125,7 @@ - + From 098ce6d2584dddba948c5bcd05b7ea14b6ad7800 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 28 Jan 2013 15:01:20 +0100 Subject: [PATCH 04/14] [IMP] res_partner: context with simple_mode for the user_id field bzr revid: chm@openerp.com-20130128140120-3oxed3t9fj5r2agv --- openerp/addons/base/res/res_partner_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index d3f204e102a..c507509636d 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -269,7 +269,7 @@ - + From 25959e7dd16ff50ed174a1062e9eab75336fb2f2 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 30 Jan 2013 12:13:05 +0100 Subject: [PATCH 05/14] [IMP] res_user: add a simplified form view with a comment for default_groups_ref values bzr revid: chm@openerp.com-20130130111305-7g70l4cz7gfk98dr --- openerp/addons/base/res/res_partner_view.xml | 4 +- openerp/addons/base/res/res_users_view.xml | 41 ++++++++++++++++++-- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index c507509636d..ce2de3a8fb7 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -269,7 +269,9 @@ - + diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 9d6b334e180..fd6d56e6ce8 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -85,14 +85,48 @@ + + res.users.simplified.form + res.users + 1 + + + + +
+
+ +
+ You are creating a new user. + + This user will have the access rights to be able to do the task assigned to it. You can see this list of groups of access rights on the field of the form view. + + You should use the "Settings > Users" menu to change his access rights and other settings. +
+ + + + + + + + + + res.users.form res.users
- -
+ +
@@ -105,7 +139,7 @@
- + @@ -145,6 +179,7 @@
+ res.users.tree res.users From 681fe702e7d8e46acc3bac41dd8e5be1a2615119 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 7 Feb 2013 12:23:16 +0100 Subject: [PATCH 06/14] [FIX] res_user: remove invisible attribute on reset password button bzr revid: chm@openerp.com-20130207112316-h7sqbhrnisahj5bm --- openerp/addons/base/res/res_users_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index fd6d56e6ce8..24a9b3e08d3 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -126,7 +126,7 @@
-
+
From 56be34af8e1deeb56b8d5ebd5067ec5f02768011 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 7 Feb 2013 13:01:08 +0100 Subject: [PATCH 07/14] [FIX] res_user: display reset password button on simple form bzr revid: chm@openerp.com-20130207120108-qqk86bt9gxvb15m0 --- openerp/addons/base/res/res_users_view.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 24a9b3e08d3..3848669efec 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -92,6 +92,10 @@ +
+
- This new user will have the access rights: . To refine access rights, ou can create users from the menu Settings / Users. + The new user will have the following access rights: . You will be able to define additional access rights by editing the newly created user under the Settings / Users menu.
From a8aebe31f3af540c8ce6761ec07fc6dcae146781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 15 Mar 2013 10:36:58 +0100 Subject: [PATCH 14/14] [IMP] res_users: improved simplified form (using info_box). bzr revid: tde@openerp.com-20130315093658-8ihhf3h4w6q3vypo --- openerp/addons/base/res/res_users_view.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 4f5a94036bc..daa25806349 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -93,6 +93,9 @@
+
+ You are creating a new user. After saving, the user will receive an invite email containing a link to set its password. +
- -
- The new user will have the following access rights: . You will be able to define additional access rights by editing the newly created user under the Settings / Users menu.
+