From b8f0d49f4876775cd9c6f6508040d0c12ad63ee5 Mon Sep 17 00:00:00 2001 From: Andre D Date: Mon, 20 May 2013 12:14:07 -0700 Subject: [PATCH] listing: odd/even class should happen after keep_fn. --- r2/r2/models/builder.py | 6 ------ r2/r2/models/listing.py | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/r2/r2/models/builder.py b/r2/r2/models/builder.py index c2dba7715..215c19998 100755 --- a/r2/r2/models/builder.py +++ b/r2/r2/models/builder.py @@ -108,7 +108,6 @@ class Builder(object): types = {} wrapped = [] - count = 0 modlink = {} modlabel = {} @@ -214,11 +213,6 @@ class Builder(object): if not item.verdict.endswith("-approved"): w.link_notes.append(w.verdict) - w.rowstyle = getattr(w, 'rowstyle', "") - w.rowstyle += ' ' + ('even' if (count % 2) else 'odd') - - count += 1 - if c.user_is_admin and getattr(item, 'ip', None): w.ip_span = ip_span(item.ip) else: diff --git a/r2/r2/models/listing.py b/r2/r2/models/listing.py index 0b1c2ef26..752bf555e 100644 --- a/r2/r2/models/listing.py +++ b/r2/r2/models/listing.py @@ -89,6 +89,11 @@ class Listing(object): p.update({'after':next._fullname, 'before':None, 'count':acount}) self.after = next._fullname self.next = (request.path + utils.query_string(p)) + + for count, thing in enumerate(self.things): + thing.rowstyle = getattr(thing, 'rowstyle', "") + thing.rowstyle += ' ' + ('even' if (count % 2) else 'odd') + #TODO: need name for template -- must be better way return Wrapped(self)