Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
synnefo
Commits
3647b2a6
Commit
3647b2a6
authored
Jul 31, 2012
by
Sofia Papagiannaki
Browse files
call ``send_greeting`` from ``switch_account_to_shibboleth`` instead of ``activate`` view
parent
90f1762d
Changes
2
Hide whitespace changes
Inline
Side-by-side
snf-astakos-app/astakos/im/functions.py
View file @
3647b2a6
...
...
@@ -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'
):
...
...
snf-astakos-app/astakos/im/views.py
View file @
3647b2a6
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment