Merge lp:~dorian-kemps/unifield-web/US-10141 into lp:unifield-web

[jftempo]

[lp:~dorian-kemps/unifield-web/US-10141]

5037. By Dorian on 2022-06-28

US-10141 [PROGRESS] Login: Added a new message in case the DB isn't correctly restored. Fixed restore warning message

5038. By Dorian on 2022-06-28

US-10141 [FIX] Login: Added a new message in case the DB isn't correctly restored. Fixed restore warning message

5039. By Dorian on 2022-06-28

US-10141 [FIX] Login: Fixed translation of restoration message

=== modified file 'addons/openerp/controllers/templates/database.mako'
--- addons/openerp/controllers/templates/database.mako	2017-11-24 14:13:57 +0000
+++ addons/openerp/controllers/templates/database.mako	2022-06-28 11:52:55 +0000
@@ -69,6 +69,11 @@
             </table>
         </div>
         <hr style="margin: 0 0 !important; background-color: #5A5858;">
+        %if form.name == 'restore':
+        <div class="restore_warning">
+            ${_('You will automatically be redirected to the Login screen after the database is fully restored. Please wait until the process is completed.')}
+        </div>
+        %endif
         <div>${form.display()}</div>
 
 	%if form.name == 'restore':

=== modified file 'addons/openerp/controllers/utils.py'
--- addons/openerp/controllers/utils.py	2021-02-05 10:07:23 +0000
+++ addons/openerp/controllers/utils.py	2022-06-28 11:52:55 +0000
@@ -221,7 +221,10 @@
             if action == 'login' and login_ret == -4:
                 return login(cherrypy.request.path_info, message=_('A script during patch failed! Login is forbidden for the moment. Please contact your administrator'),
                              db=db, user=user, action=action, origArgs=get_orig_args(kw))
-            if action == 'login' and login_ret in (-5, -7): # must change password
+            if action == 'login' and login_ret == -8:
+                return login(cherrypy.request.path_info, message=_('Login refused. The database restoration has failed, please delete it and try again'),
+                             db=db, user=user, action=action, origArgs=get_orig_args(kw))
+            if action == 'login' and login_ret in (-5, -7):  # must change password
                 if 'confirm_password' in kw:
                     message = rpc.session.change_password(db, user, password, kw['new_password'], kw['confirm_password'])
                     if message is not True:

=== modified file 'addons/openerp/po/messages/fr.po'
--- addons/openerp/po/messages/fr.po	2022-05-09 12:28:10 +0000
+++ addons/openerp/po/messages/fr.po	2022-06-28 11:52:55 +0000
@@ -152,6 +152,10 @@
 msgid "New database name:"
 msgstr "Nom de la nouvelle base de données :"
 
+#: controllers/templates/database.mako:72
+msgid "You will automatically be redirected to the Login screen after the database is fully restored. Please wait until the process is completed."
+msgstr "Vous serez automatiquement redirigé(e) vers l'écran d'Identification une fois que la base de données sera complètement restaurée. Veuillez attendre que le processus soit entièrement terminé."
+
 #: controllers/database.py:69
 msgid ""
 "Choose the name of the database that will be created. The name must not "
@@ -520,6 +524,10 @@
 msgid "Your IP have been blocked because of too many bad login attempts. It will be unblocked after %s minutes."
 msgstr "Votre IP à été bloquée à cause d'un trop grand nombre de connexion infructueuses. Elle sera débloquée dans %s minutes."
 
+#: controllers/utils.py:225
+msgid "Login refused. The database restoration has failed, please delete it and try again"
+msgstr "Identification refusée. La restauration de la base de données a échoué, veuillez la supprimer et recommencer"
+
 #: controllers/view_log.py:32
 msgid "ID"
 msgstr "ID"

=== modified file 'addons/openerp/static/css/style.css'
--- addons/openerp/static/css/style.css	2020-02-24 15:15:02 +0000
+++ addons/openerp/static/css/style.css	2022-06-28 11:52:55 +0000
@@ -639,6 +639,13 @@
     white-space: nowrap;
 }
 
+.restore_warning {
+    text-align:center;
+    margin-top:20px;
+    font-weight: bold;
+    color: red;
+}
+
 .action-buttons label {
     display: block;
 }

=== modified file 'addons/openerp/utils/rpc.py'
--- addons/openerp/utils/rpc.py	2021-02-05 10:07:23 +0000
+++ addons/openerp/utils/rpc.py	2022-06-28 11:52:55 +0000
@@ -148,6 +148,8 @@
                 common.error('PatchFailed', err.code)
             elif err.code.startswith('AccessDenied'):
                 raise openobject.errors.AccessDenied(err.code, _('Access Denied'))
+            elif err.code.startswith('BadRestoration'):
+                common.error('BadRestoration', err.code)
             else:
                 common.error(_('Application Error'), err.backtrace)
 
@@ -372,6 +374,8 @@
                 return -5
             elif e.title == 'PasswordExpired':
                 return -7
+            elif e.title == 'BadRestoration':
+                return -8
             return -1
 
         if uid <= 0: