call ``send_greeting`` from ``switch_account_to_shibboleth`` instead of ``activate...

diff --git a/snf-astakos-app/astakos/im/functions.py b/snf-astakos-app/astakos/im/functions.py
index c0fe0f9..1cc41b5 100644 (file)
--- a/snf-astakos-app/astakos/im/functions.py
+++ b/snf-astakos-app/astakos/im/functions.py
@@ -246,7 +246,7 @@ def activate(user, email_template_name='im/welcome_email.txt',
     send_helpdesk_notification(user, helpdesk_email_template_name)
     send_greeting(user, email_template_name)
 
-def switch_account_to_shibboleth(user, local_user):
+def switch_account_to_shibboleth(user, local_user, greeting_template_name='im/welcome_email.txt'):
     if not user or not isinstance(user, AstakosUser):
         return
     
@@ -261,6 +261,7 @@ def switch_account_to_shibboleth(user, local_user):
     local_user.set_unusable_password()
     local_user.third_party_identifier = user.third_party_identifier
     local_user.save()
+    send_greeting(local_user, greeting_template_name)
     return local_user
 
 def invite(invitation, inviter, email_template_name='im/welcome_email.txt'):

diff --git a/snf-astakos-app/astakos/im/views.py b/snf-astakos-app/astakos/im/views.py
index e08e445..137711c 100644 (file)
--- a/snf-astakos-app/astakos/im/views.py
+++ b/snf-astakos-app/astakos/im/views.py
@@ -473,8 +473,7 @@ def activate(request, email_template_name='im/welcome_email.txt', helpdesk_email
             return index(request)
     else:
         try:
-            user = switch_account_to_shibboleth(user, local_user)
-            send_greeting(user, email_template_name)
+            user = switch_account_to_shibboleth(user, local_user, email_template_name)
             response = prepare_response(request, user, next, renew=True)
             transaction.commit()
             return response