summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-11-02 21:50:31 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-11-02 21:50:31 -0400
commit2ed72c554cbada913b9c344d2224eb0d33502f5f (patch)
tree5e8970d2d3125de7d6aeb7cb3d0550342e267ea2
parent2bbc90ec4170dd3b15fba456fede68a94f4a52dc (diff)
downloadaskbot-2ed72c554cbada913b9c344d2224eb0d33502f5f.tar.gz
askbot-2ed72c554cbada913b9c344d2224eb0d33502f5f.tar.bz2
askbot-2ed72c554cbada913b9c344d2224eb0d33502f5f.zip
allowed search for tag like c++, works in mysql, but only partially in postgres so far
-rw-r--r--askbot/models/__init__.py3
-rw-r--r--askbot/models/answer.py2
-rw-r--r--askbot/skins/default/templates/header.html2
-rw-r--r--askbot/views/readers.py5
4 files changed, 5 insertions, 7 deletions
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py
index 16e650aa..ccac6b2d 100644
--- a/askbot/models/__init__.py
+++ b/askbot/models/__init__.py
@@ -988,9 +988,6 @@ def user_visit_question(self, question = None, timestamp = None):
who = self,
question = question
)
- response_activities = response_activities.filter(
- active_at__gt = question_view.when
- )
except QuestionView.DoesNotExist:
question_view = QuestionView(
who = self,
diff --git a/askbot/models/answer.py b/askbot/models/answer.py
index 16463616..634481d9 100644
--- a/askbot/models/answer.py
+++ b/askbot/models/answer.py
@@ -188,7 +188,7 @@ class Answer(content.Content, DeletableContent):
return list(receiving_users)
def get_user_vote(self, user):
- if user.__class__.__name__ == "AnonymousUser":
+ if user.is_anonymous():
return None
votes = self.votes.filter(user=user)
diff --git a/askbot/skins/default/templates/header.html b/askbot/skins/default/templates/header.html
index 4c280acc..e549fa69 100644
--- a/askbot/skins/default/templates/header.html
+++ b/askbot/skins/default/templates/header.html
@@ -11,7 +11,7 @@
alt="{% trans username=request.user.username %}responses for {{username}}{% endtrans %}"
{% if request.user.response_count > 0 %}
src="{{ "/images/mail-envelope-full.png"|media }}"
- title="{% trans response_count=request.user.response %}you have a new response{% pluralize %}you nave {{response_count}} new responses{% endtrans %}"
+ title="{% trans response_count=request.user.response_count %}you have a new response{% pluralize %}you nave {{response_count}} new responses{% endtrans %}"
{% else %}
src="{{ "/images/mail-envelope-empty.png"|media }}"
title="{% trans %}no new responses yet{% endtrans %}"
diff --git a/askbot/views/readers.py b/askbot/views/readers.py
index 25425659..b29e474a 100644
--- a/askbot/views/readers.py
+++ b/askbot/views/readers.py
@@ -16,6 +16,7 @@ from django.core.paginator import Paginator, EmptyPage, InvalidPage
from django.template import RequestContext, Context
from django.template import defaultfilters
from django.utils.html import *
+from django.utils.http import urlencode
from django.utils import simplejson
from django.utils.translation import ugettext as _
from django.utils import translation
@@ -326,9 +327,9 @@ def search(request): #generates listing of questions matching a search query - i
except ValueError:
page = 1
if search_type == 'tag':
- return HttpResponseRedirect(reverse('tags') + '?q=%s&page=%s' % (query.strip(), page))
+ return HttpResponseRedirect(reverse('tags') + '?' + urlencode({'q':query.strip(),'page': page}))
elif search_type == 'user':
- return HttpResponseRedirect(reverse('users') + '?q=%s&page=%s' % (query.strip(), page))
+ return HttpResponseRedirect(reverse('users') + '?' + urlencode({'q':query.strip(),'page': page}))
else:
raise Http404
else: