diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-10-03 16:53:30 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-10-03 16:53:30 -0300 |
| commit | 5d482f3dd77b892399677c6984c06b471dc252d0 (patch) | |
| tree | 452d021219f736d71fb71e4f2051b75900e1fd15 | |
| parent | baa02367ecd75932ed785efe44b129c8d773696e (diff) | |
| parent | f0a889b97eba513f576ad61c850ce08b3d580859 (diff) | |
| download | askbot-5d482f3dd77b892399677c6984c06b471dc252d0.tar.gz askbot-5d482f3dd77b892399677c6984c06b471dc252d0.tar.bz2 askbot-5d482f3dd77b892399677c6984c06b471dc252d0.zip | |
Merge branch 'raags'
| -rw-r--r-- | askbot/conf/site_settings.py | 9 | ||||
| -rw-r--r-- | askbot/middleware/anon_user.py | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/askbot/conf/site_settings.py b/askbot/conf/site_settings.py index 0cab800b..30a033ca 100644 --- a/askbot/conf/site_settings.py +++ b/askbot/conf/site_settings.py @@ -70,6 +70,15 @@ settings.register( ) settings.register( + livesettings.BooleanValue( + QA_SITE_SETTINGS, + 'GREETING_FOR_ANON_USER_ON', + default = True, + description = _('Check to enable greeting for anonymous user') + ) +) + +settings.register( livesettings.StringValue( QA_SITE_SETTINGS, 'GREETING_FOR_ANONYMOUS_USER', diff --git a/askbot/middleware/anon_user.py b/askbot/middleware/anon_user.py index d1e223b7..4b72ab4a 100644 --- a/askbot/middleware/anon_user.py +++ b/askbot/middleware/anon_user.py @@ -43,7 +43,8 @@ class ConnectToSessionMessagesMiddleware(object): #also set the first greeting one time per session only if 'greeting_set' not in request.session and \ - 'askbot_visitor' not in request.COOKIES: + 'askbot_visitor' not in request.COOKIES and \ + askbot_settings.GREETING_FOR_ANON_USER_ON: request.session['greeting_set'] = True msg = askbot_settings.GREETING_FOR_ANONYMOUS_USER request.user.message_set.create(message=msg) |