Revision d2c9adac snf-astakos-app/astakos/im/forms.py
b/snf-astakos-app/astakos/im/forms.py | ||
---|---|---|
30 | 30 |
# documentation are those of the authors and should not be |
31 | 31 |
# interpreted as representing official policies, either expressed |
32 | 32 |
# or implied, of GRNET S.A. |
33 |
from urlparse import urljoin |
|
34 | 33 |
from random import random |
35 | 34 |
from datetime import datetime, timedelta |
36 | 35 |
|
... | ... | |
55 | 54 |
from django.contrib.auth.models import AnonymousUser |
56 | 55 |
from django.core.exceptions import PermissionDenied |
57 | 56 |
|
57 |
from synnefo.lib import join_urls |
|
58 | 58 |
from astakos.im.models import ( |
59 | 59 |
AstakosUser, EmailChange, Invitation, |
60 | 60 |
Resource, PendingThirdPartyUser, get_latest_terms, |
... | ... | |
539 | 539 |
""" |
540 | 540 |
for user in self.users_cache: |
541 | 541 |
url = user.astakosuser.get_password_reset_url(token_generator) |
542 |
url = urljoin(BASEURL, url)
|
|
542 |
url = join_urls(BASEURL, url)
|
|
543 | 543 |
t = loader.get_template(email_template_name) |
544 | 544 |
c = { |
545 | 545 |
'email': user.email, |
Also available in: Unified diff