This commit is contained in:
Dave Dash 2010-08-06 11:31:28 -07:00
Родитель 447deb38a3
Коммит b79013115c
2 изменённых файлов: 9 добавлений и 5 удалений

Просмотреть файл

@ -56,7 +56,8 @@ def barometer(context, collection):
down_title = _('Add a negative vote for this collection')
cancel_title = _('Remove my vote for this collection')
votes = request.amo_user.votes.filter(collection=collection)
votes = request.amo_user.votes.filter(
collection=collection).values_list('vote', flat=True)
if votes:
user_vote = votes[0]
@ -80,7 +81,7 @@ def barometer(context, collection):
down_width = max(down_ratio - 1, 0)
if user_vote:
if user_vote.vote > 0:
if user_vote > 0:
up_class += ' voted'
else:
down_class += ' voted'

Просмотреть файл

@ -5,6 +5,7 @@ from mock import Mock
from pyquery import PyQuery as pq
import jingo
from amo.urlresolvers import reverse
from bandwagon.helpers import (user_collection_list, barometer,
collection_favorite)
from bandwagon.models import Collection
@ -42,7 +43,7 @@ class TestHelpers(test.TestCase):
collection = Collection.objects.get(pk=57274)
collection.upvotes = 1
# Mock logged out.
c = dict(request=Mock())
c = dict(request=Mock(), user=Mock(), LANG='en-US', APP='firefox')
c['request'].path = 'yermom'
c['request'].GET.urlencode = lambda: ''
c['request'].user.is_authenticated = lambda: False
@ -50,12 +51,14 @@ class TestHelpers(test.TestCase):
eq_(doc('form')[0].action, '/en-US/firefox/users/login?to=yermom')
# Mock logged in.
c['request'].amo_user.votes.filter = lambda collection: [1]
qs = Mock()
qs.values_list = lambda *args, **kw: [1]
c['request'].amo_user.votes.filter = lambda **kw: qs
c['request'].user.is_authenticated = lambda: True
barometer(c, collection)
doc = pq(barometer(c, collection))
eq_(doc('form')[0].action,
remora_url('collections/vote/%s/up' % collection.uuid))
reverse('collections.vote', args=['anonymous', None, 'up']))
def test_user_collection_list(self):
c1 = Collection.objects.create(