From 68785bf46b5b5138c4dbd2b99287d77ed05957ed Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 12 Nov 2019 15:18:42 +0100 Subject: [PATCH] registration: updated flash with more information after user registered. --- rhodecode/apps/login/tests/test_login.py | 2 +- rhodecode/apps/login/views.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rhodecode/apps/login/tests/test_login.py b/rhodecode/apps/login/tests/test_login.py index 1acf8ddb..0d9d150e 100644 --- a/rhodecode/apps/login/tests/test_login.py +++ b/rhodecode/apps/login/tests/test_login.py @@ -401,7 +401,7 @@ class TestLoginController(object): ) # This should be overridden assert_session_flash( - response, 'You have successfully registered with RhodeCode') + response, 'You have successfully registered with RhodeCode. You can log-in now.') ret = Session().query(User).filter( User.username == 'test_regular4').one() diff --git a/rhodecode/apps/login/views.py b/rhodecode/apps/login/views.py index 17640631..f3ca7797 100644 --- a/rhodecode/apps/login/views.py +++ b/rhodecode/apps/login/views.py @@ -312,8 +312,6 @@ class LoginView(BaseAppView): action_data = {'data': new_user.get_api_data(), 'user_agent': self.request.user_agent} - - if external_identity: action_data['external_identity'] = external_identity @@ -329,8 +327,13 @@ class LoginView(BaseAppView): event = UserRegistered(user=new_user, session=self.session) trigger(event) h.flash( - _('You have successfully registered with RhodeCode'), + _('You have successfully registered with RhodeCode. You can log-in now.'), category='success') + if external_identity: + h.flash( + _('Please use the {identity} button to log-in').format( + identity=external_identity), + category='success') Session().commit() redirect_ro = self.request.route_path('login')