diff options
author | hrcerqueira <hrcerqueira@gmail.com> | 2010-03-03 16:26:54 +0000 |
---|---|---|
committer | hrcerqueira <hrcerqueira@gmail.com> | 2010-03-03 16:26:54 +0000 |
commit | 5c526e37056aace78960d974c208d19c3703aa48 (patch) | |
tree | f72d21d4eb7c4caa6b64c1c3cbf50efb5f5e93f9 /forum | |
parent | 55aa657509c1da9cfc57f5fe32929a3ef7582dd4 (diff) | |
download | askbot-5c526e37056aace78960d974c208d19c3703aa48.tar.gz askbot-5c526e37056aace78960d974c208d19c3703aa48.tar.bz2 askbot-5c526e37056aace78960d974c208d19c3703aa48.zip |
Fix in the email url tags.
Diffstat (limited to 'forum')
-rwxr-xr-x | forum/templatetags/extra_tags.py | 8 | ||||
-rw-r--r-- | forum/views/auth.py | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py index 8fa01629..6dab868b 100755 --- a/forum/templatetags/extra_tags.py +++ b/forum/templatetags/extra_tags.py @@ -363,9 +363,9 @@ class FullUrlNode(template.Node): def render(self, context): domain = settings.APP_URL - protocol = getattr(settings, "PROTOCOL", "http") + #protocol = getattr(settings, "PROTOCOL", "http") path = self.default_node.render(context) - return "%s://%s%s" % (protocol, domain, path) + return "%s%s" % (domain, path) @register.tag(name='fullurl') def fullurl(parser, token): @@ -375,8 +375,8 @@ def fullurl(parser, token): @register.simple_tag def fullmedia(url): domain = settings.APP_URL - protocol = getattr(settings, "PROTOCOL", "http") + #protocol = getattr(settings, "PROTOCOL", "http") path = media(url) - return "%s://%s%s" % (protocol, domain, path) + return "%s%s" % (domain, path) diff --git a/forum/views/auth.py b/forum/views/auth.py index 74f7af4b..1b57853a 100644 --- a/forum/views/auth.py +++ b/forum/views/auth.py @@ -212,6 +212,8 @@ def request_temp_login(request): 'user': user }) + request.user.message_set.create(message=_("An email has been sent with your temporary login key")) + return HttpResponseRedirect(reverse('index')) else: form = TemporaryLoginRequestForm() @@ -224,7 +226,6 @@ def temp_signin(request, user, code): user = get_object_or_404(User, id=user) if (ValidationHash.objects.validate(code, user, 'templogin', [user.id])): - print user.get_absolute_url() return login_and_forward(request, user, reverse('user_authsettings'), _("You are logged in with a temporary access key, please take the time to fix your issue with authentication.")) else: |