Commit 08649091 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Minor edits in email texts.

parent 0ee0ca1d

services/webapp/code/rosetta/core_app/api.py

+2 −2
Original line number Diff line number Diff line
@@ -362,8 +362,8 @@ print(port) 
            # Notify the user that the task called back home if using a WMS

            if task.computing.wms:

                logger.info('Agent API sending task ready mail notification to "{}"'.format(task.user.email))

                mail_subject = 'Your Task "{}" is now starting up'.format(task.container.name)

                mail_text = 'Hello,\n\nyour Task "{}" on {} is now starting up. Check logs or connect here: https://{}/tasks/?uuid={}\n\nThe Rosetta notifications bot.'.format(task.container.name, task.computing, settings.ROSETTA_HOST, task.uuid)

                mail_subject = 'Your task "{}" is now starting up'.format(task.container.name)

                mail_text = 'Hello,\n\nyour task "{}" on the computing resource "{}" is now starting up. Connect or check logs here: https://{}/tasks/?uuid={}\n\nThe Rosetta platform.'.format(task.container.name, task.computing.name, settings.ROSETTA_HOST, task.uuid)

                try:

                    send_email(to=task.user.email, subject=mail_subject, text=mail_text)

                except Exception as e:

services/webapp/code/rosetta/core_app/views.py

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ def login_view(request): 
                        loginToken.token = token

                        loginToken.save()

                    try:

                        send_email(to=user.email, subject='Rosetta login link', text='Hello,\n\nhere is your login link: https://{}/login/?token={}\n\nOnce logged in, you can go to "My Account" and change password (or just keep using the login link feature).\n\nThe Rosetta Team.'.format(settings.ROSETTA_HOST, token))

                        send_email(to=user.email, subject='Rosetta login link', text='Hello,\n\nhere is your login link: https://{}/login/?token={}\n\nOnce logged in, you can go to "My Account" and change password (or just keep using the login link feature).\n\nThe Rosetta platform.'.format(settings.ROSETTA_HOST, token))

                    except Exception as e:

                        logger.error(format_exception(e))

                        raise ErrorMessage('Something went wrong. Please retry later.')