summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-08-06 22:41:00 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-08-06 22:41:00 -0400
commit786ec578db030b2f887db2f582e77a1a45c48eb4 (patch)
treef04d001de6ff0a91a156f1624c24a9ff2228ac0f
parent664a54fec35ed9768aeb7e40a3f56cc7b819bd73 (diff)
downloadaskbot-786ec578db030b2f887db2f582e77a1a45c48eb4.tar.gz
askbot-786ec578db030b2f887db2f582e77a1a45c48eb4.tar.bz2
askbot-786ec578db030b2f887db2f582e77a1a45c48eb4.zip
small changes around responding by email
-rw-r--r--askbot/deps/django_authopenid/views.py5
-rw-r--r--askbot/models/__init__.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py
index d9fc9d1f..797c47b5 100644
--- a/askbot/deps/django_authopenid/views.py
+++ b/askbot/deps/django_authopenid/views.py
@@ -1314,6 +1314,10 @@ def account_recover(request):
login(request, user)
else:
login(request, user)
+
+ from askbot.models import greet_new_user
+ greet_new_user(user)
+
#need to show "sticky" signin view here
return show_signin_view(
request,
@@ -1323,6 +1327,7 @@ def account_recover(request):
else:
return show_signin_view(request, view_subtype = 'bad_key')
+ return HttpResponseRedirect(get_next_url(request))
#internal server view used as return value by other views
def validation_email_sent(request):
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py
index 1827fa62..41a766b8 100644
--- a/askbot/models/__init__.py
+++ b/askbot/models/__init__.py
@@ -466,7 +466,7 @@ def user_can_post_by_email(self):
if self.is_administrator_or_moderator():
return True
return askbot_settings.REPLY_BY_EMAIL and \
- self.reputation > askbot_settings.MIN_REP_TO_POST_BY_EMAIL
+ self.reputation >= askbot_settings.MIN_REP_TO_POST_BY_EMAIL
def user_get_social_sharing_mode(self):
"""returns what user wants to share on his/her channels"""