[IMP]base_setup: Label Name Improved in terminology

[odoo/odoo.git] / addons / base_setup / __init__.py

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 1fa2e7c..2dab90b 100644 (file)
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -20,8 +20,6 @@
 ##############################################################################
 
 import installer
-import todo
-import gtk_contact_form
 import wizard
 import os
 import base64
@@ -43,12 +41,18 @@ class base_setup_config_choice(osv.osv_memory):
         file_data = tools.file_open(path,'rb').read()
         return base64.encodestring(file_data)
 
-    def get_users(self, cr, uid, context={}):
+    def get_users(self, cr, uid, context=None):
         user_obj = self.pool.get('res.users')
         user_ids = user_obj.search(cr, uid, [])
-        users = user_obj.browse(cr, uid, user_ids)
-        user_str = '\n'.join(map(lambda x: '    - %s:\n\t\tLogin: %s \n\t\tPassword:%s' % (x.name, x.login, x.password), users))
-        return _('The following users have been installed : \n')+ user_str
+        user_list = []
+        user_tmpl_nopass = _('    - %s :\n\t\tLogin : %s')
+        user_tmpl_pass =   _('    - %s :\n\t\tLogin : %s \n\t\tPassword : %s')
+        for user in user_obj.browse(cr, uid, user_ids, context=context):
+            if user.password and not user.password.startswith('$'):
+                user_list.append(user_tmpl_pass % (user.name, user.login, user.password))
+            else:
+                user_list.append(user_tmpl_nopass % (user.name, user.login))
+        return _('The following users have been installed : \n')+ '\n'.join(user_list)
 
     _columns = {
         'installed_users':fields.text('Installed Users', readonly=True),
@@ -60,25 +64,15 @@ class base_setup_config_choice(osv.osv_memory):
          'config_logo' : _get_image
         }
 
-    def set_default_menu(self, cr, uid, menu, context=None):
-        user = self.pool.get('res.users')\
-                        .browse(cr, uid, uid, context=context)
-
-        user.write({'action_id': menu.id,
-                    'menu_id': menu.id})
-
-    def get_default_menu(self, cr, uid, context=None):
-        actions = self.pool.get('ir.actions.act_window')
-
-        current_menu_id = actions.search(cr, uid, [('name','=','Menu')],
-                                         context=context)
-        assert len(current_menu_id) == 1,\
-               'A given user should only have one menu item'
-        return actions.browse(cr, uid, current_menu_id[0], context=context)
+    def reset_menu(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        menu_id = user._get_menu()
+        user.write({'action_id': False,
+                    'menu_id': menu_id})
+        return self.pool.get('ir.actions.act_window').browse(cr, uid, menu_id, context=context)
 
     def menu(self, cr, uid, ids, context=None):
-        menu = self.get_default_menu(cr, uid, context=context)
-        self.set_default_menu(cr, uid, menu, context=context)
+        menu = self.reset_menu(cr, uid, context=context)
 
         if menu.view_id.id:
             view_id = (menu.view_id.id, menu.view_id.name)
@@ -98,9 +92,7 @@ class base_setup_config_choice(osv.osv_memory):
         }
 
     def config(self, cr, uid, ids, context=None):
-        menu = self.get_default_menu(cr, uid, context=context)
-        self.set_default_menu(cr, uid, menu, context=context)
-
+        self.reset_menu(cr, uid, context=context)
         return self.pool.get('res.config').next(cr, uid, [], context=context)
 
 base_setup_config_choice()