From c60905fb1eb3937efb37113858e0dff73a40460b Mon Sep 17 00:00:00 2001 From: hernani Date: Fri, 4 Jun 2010 15:22:27 +0000 Subject: [PATCH] Converts the temp login email to the new style, and makes some more enahncements to the settings. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@376 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/settings/base.py | 15 +++++-- .../templates/auth/temp_login_email.html | 40 ++++++++++++------- forum/views/auth.py | 5 +-- forum/views/meta.py | 3 -- forum_modules/localauth/views.py | 1 + 5 files changed, 38 insertions(+), 26 deletions(-) diff --git a/forum/settings/base.py b/forum/settings/base.py index 75687be..cdc80b0 100644 --- a/forum/settings/base.py +++ b/forum/settings/base.py @@ -1,6 +1,7 @@ import django.dispatch from django.utils.encoding import force_unicode from datetime import datetime, timedelta +import logging TMP_MINICACHE_SECONDS = 5 @@ -54,22 +55,28 @@ class BaseSetting(object): v = kv.value self._temp = (v, datetime.now() + timedelta(seconds=TMP_MINICACHE_SECONDS)) return v + except KeyValue.DoesNotExist: + self._temp = (self.default, datetime.now() + timedelta(seconds=TMP_MINICACHE_SECONDS)) except Exception, e: - return self.default + logging.error("Error retrieving setting from database (%s): %s" % (self.name, str(e))) + + return self.default def set_value(self, new_value): new_value = self._parse(new_value) + self._temp = None self.save(new_value) def save(self, value): - self._temp = None - from forum.models import KeyValue try: kv = KeyValue.objects.get(key=self.name) - except: + except KeyValue.DoesNotExist: kv = KeyValue(key=self.name) + except Exception, e: + logging.error("Error savin setting to database (%s): %s" % (self.name, str(e))) + return kv.value = value kv.save() diff --git a/forum/skins/default/templates/auth/temp_login_email.html b/forum/skins/default/templates/auth/temp_login_email.html index 8a23f65..7972213 100644 --- a/forum/skins/default/templates/auth/temp_login_email.html +++ b/forum/skins/default/templates/auth/temp_login_email.html @@ -1,21 +1,31 @@ -{% extends "email_base.html" %} -{% load i18n %} -{% load extra_tags %} -{% load email_tags %} +{% load i18n extra_tags email_tags %} -{% block content %} -

{% trans "Greetings from the Q&A forum" %},

+{% declare %} + prefix = settings.EMAIL_SUBJECT_PREFIX + app_name = settings.APP_SHORT_NAME -

{% trans "You're seeing this because someone requested a temporary login link" %}

+ exclude_finetune = True +{% enddeclare %} - {% fullurl auth_tempsignin user=user.id,code=temp_login_code %} +{% email %} + {% subject %}{% blocktrans %}{{ prefix }} Temporary login link{% endblocktrans %}{% endsubject %} -

{% trans "Following the link above will give you access to your account." %}

+ {% htmlcontent notifications/base.html %} +

+ {% blocktrans %}The following link grants you a one time access to your account at {{ app_name }}.{% endblocktrans %} +

+ {% trans "Go to your account" %} -

{% blocktrans %}If you beleive that this message was sent in mistake - - no further action is needed. Just ingore this email, we apologize - for any inconvenience{% endblocktrans %}

+

{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}

+ +

{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}

+ {% endhtmlcontent %} + +{% textcontent notifications/base_text.html %} +{% blocktrans %}The following url grants you a one time access to your account at {{ app_name }}.{% endblocktrans %} + +{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %} +{% endtextcontent %} + +{% endemail %} -

{% blocktrans %}Sincerely,
- Forum Administrator{% endblocktrans %}

-{% endblock %} diff --git a/forum/views/auth.py b/forum/views/auth.py index 442bf01..7a43349 100644 --- a/forum/views/auth.py +++ b/forum/views/auth.py @@ -215,10 +215,7 @@ def request_temp_login(request): except: hash = ValidationHash.objects.create_new(user, 'templogin', [user.id]) - send_email(_("Temporary login link"), [(user.username, user.email)], "auth/temp_login_email.html", { - 'temp_login_code': hash, - 'user': user - }) + send_template_email([user], "auth/temp_login_email.html", {'temp_login_code': hash}) request.user.message_set.create(message=_("An email has been sent with your temporary login key")) diff --git a/forum/views/meta.py b/forum/views/meta.py index c0da3a2..b4cb75a 100644 --- a/forum/views/meta.py +++ b/forum/views/meta.py @@ -28,9 +28,6 @@ def media(request, skin, path): document_root=os.path.join(os.path.dirname(os.path.dirname(__file__)),'skins').replace('\\','/')) def markdown_help(request): - # md = markdown.Markdown([SettingsExtension({})]) - # text = md.convert(settings.FAQ_PAGE_TEXT.value) - return render_to_response('markdown_help.html', context_instance=RequestContext(request)) diff --git a/forum_modules/localauth/views.py b/forum_modules/localauth/views.py index 6416fee..4392c5a 100644 --- a/forum_modules/localauth/views.py +++ b/forum_modules/localauth/views.py @@ -23,6 +23,7 @@ def register(request): if User.objects.all().count() == 0: user_.is_superuser = True + user_.is_staff = True user_.save() UserJoinsAction(user=user_, ip=request.META['REMOTE_ADDR']).save() -- 2.39.5