Merge lp:~unifield-team/unifield-web/web_aio_41 into lp:unifield-web

[Xavier ALT]

Hi,

This implement requested feature of #AIO-41

Regards,
Xavier

[lp:~unifield-team/unifield-web/web_aio_41]

4681. By Xavier ALT on 2013-01-29

[IMP] AIO-41: add newline after 'files.' in information message on super admin password change

=== modified file 'addons/openerp/controllers/database.py'
--- addons/openerp/controllers/database.py	2012-12-03 13:29:03 +0000
+++ addons/openerp/controllers/database.py	2013-01-29 09:48:20 +0000
@@ -301,6 +301,13 @@
         self.msg = {}
         try:
             rpc.session.execute_db('change_admin_password', old_password, new_password)
+            self.msg = {'message': _('The super admin password has been '
+                                     'successfully changed. As a consequence, '
+                                     'you must back up the configuration files.\\n'
+                                     'Please refer to the documentation on how to do it.'),
+                        'title': _('Information'),
+                        'redirect_to': '/openerp/login'}
+            return self.password()
         except openobject.errors.AccessDenied, e:
             self.msg = {'message': _('Bad super admin password'),
                         'title' : e.title}

=== modified file 'addons/openerp/controllers/templates/database.mako'
--- addons/openerp/controllers/templates/database.mako	2010-11-10 13:11:32 +0000
+++ addons/openerp/controllers/templates/database.mako	2013-01-29 09:48:20 +0000
@@ -24,11 +24,17 @@
 
             jQuery(document).ready(function () {
                 jQuery(document.body).append($error_tbl);
-                $error_tbl.dialog({
+                var error_dialog_options = {
                     modal: true,
                     resizable: false,
                     title: '<div class="error_message_header">${error.get("title", "Warning")}</div>'
-                });
+                };
+                % if error.get('redirect_to'):
+                    error_dialog_options['close'] = function( event, ui ) {
+                        $(location).attr('href','${error['redirect_to']}');
+                    };
+                % endif
+                $error_tbl.dialog(error_dialog_options);
             })
         </script>
     % endif