diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-09-28 18:37:17 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-09-28 18:37:17 -0400 |
| commit | c4f5d4ed97362441c1a9eb512c389b3f8fd25523 (patch) | |
| tree | 3b8d8907f098cdba5a7811083681e4544bdef0be | |
| parent | b3afad48e7b8ef63bcf24aa7ff5c8c7a0a92d197 (diff) | |
| download | askbot-c4f5d4ed97362441c1a9eb512c389b3f8fd25523.tar.gz askbot-c4f5d4ed97362441c1a9eb512c389b3f8fd25523.tar.bz2 askbot-c4f5d4ed97362441c1a9eb512c389b3f8fd25523.zip | |
fixed bug in template fragment caching and another one with generic openid login
| -rw-r--r-- | askbot/deps/django_authopenid/backends.py | 17 | ||||
| -rw-r--r-- | askbot/skins/default/templates/questions.jinja.html | 2 | ||||
| -rw-r--r-- | askbot/views/readers.py | 1 |
3 files changed, 9 insertions, 11 deletions
diff --git a/askbot/deps/django_authopenid/backends.py b/askbot/deps/django_authopenid/backends.py index 664307d4..554afda5 100644 --- a/askbot/deps/django_authopenid/backends.py +++ b/askbot/deps/django_authopenid/backends.py @@ -68,16 +68,13 @@ class AuthBackend(object): elif method == 'openid': provider_name = util.get_provider_name(openid_url) - if login_providers[provider_name]['type'].startswith('openid'): - try: - assoc = UserAssociation.objects.get( - openid_url = openid_url, - provider_name = provider_name - ) - user = assoc.user - except UserAssociation.DoesNotExist: - return None - else: + try: + assoc = UserAssociation.objects.get( + openid_url = openid_url, + provider_name = provider_name + ) + user = assoc.user + except UserAssociation.DoesNotExist: return None elif method == 'email': diff --git a/askbot/skins/default/templates/questions.jinja.html b/askbot/skins/default/templates/questions.jinja.html index 921c05e1..aa68cb9f 100644 --- a/askbot/skins/default/templates/questions.jinja.html +++ b/askbot/skins/default/templates/questions.jinja.html @@ -21,7 +21,7 @@ <script type='text/javascript' src='{{"/js/com.cnprog.tag_selector.js"|media}}'></script> {% endblock %} {% block content %} -{% cache 600 "scope_sort_tabs" search_tags request.user scope sort query context.page context.page_size current_language %} +{% cache 600 "scope_sort_tabs" search_tags request.user scope sort query context.page context.page_size language_code %} <div class="tabBar"> <div class="tabsC"> <span class="label">{% trans %}In:{% endtrans %}</span> diff --git a/askbot/views/readers.py b/askbot/views/readers.py index 3d95ca8d..078accac 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -314,6 +314,7 @@ def questions(request): template_context = RequestContext(request, { 'language_code': translation.get_language(), + 'reset_method_count': reset_method_count, 'view_name': 'questions', 'active_tab': 'questions', 'questions' : questions, |