Skip to content

Commit

Permalink
bug 618983, activity feed filters persist.
Browse files Browse the repository at this point in the history
  • Loading branch information
davedash committed Mar 14, 2011
1 parent a3e75ce commit 52944ef
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
5 changes: 5 additions & 0 deletions apps/devhub/tests/test_feeds.py
Expand Up @@ -82,6 +82,11 @@ def test_items(self):
doc = self.get_pq()
eq_(len(doc('.item')), 10)

def test_filter_persistence(self):
doc = self.get_pq(action='status')
assert '?action=status' in (doc('ul.refinements').eq(0)('a').eq(1)
.attr('href'))

def test_filter_updates(self):
self.log_creates(10)
self.log_updates(10)
Expand Down
8 changes: 6 additions & 2 deletions apps/devhub/views.py
Expand Up @@ -151,13 +151,15 @@ def ajax_compat_update(request, addon_id, addon, version_id):
compat_form=compat_form))


def _get_addons(request, addons, addon_id):
def _get_addons(request, addons, addon_id, action):
"""Create a list of ``MenuItem``s for the activity feed."""
items = []

a = MenuItem()
a.selected = (not addon_id)
(a.text, a.url) = (_('All My Add-ons'), reverse('devhub.feed_all'))
if action:
a.url += '?action=' + action
items.append(a)

for addon in addons:
Expand All @@ -167,6 +169,8 @@ def _get_addons(request, addons, addon_id):
except ValueError:
pass # We won't get here... EVER
url = reverse('devhub.feed', args=[addon.slug])
if action:
url += '?action=' + action
item.text, item.url = addon.name, url
items.append(item)

Expand Down Expand Up @@ -253,7 +257,7 @@ def feed(request, addon_id=None):
items = _get_items(action, addons)

activities = _get_activities(request, action)
addon_items = _get_addons(request, addons_all, addon_selected)
addon_items = _get_addons(request, addons_all, addon_selected, action)

pager = amo.utils.paginate(request, items, 20)
data = dict(addons=addon_items, pager=pager, activities=activities,
Expand Down

0 comments on commit 52944ef

Please sign in to comment.