From 1bba953dc78c96f25243d3ed2134058f9afb4d44 Mon Sep 17 00:00:00 2001 From: Chad Birch Date: Fri, 4 Oct 2013 15:17:16 -0600 Subject: [PATCH] Userpage: add gilded tab --- r2/r2/controllers/listingcontroller.py | 9 +++++++++ r2/r2/lib/pages/pages.py | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/r2/r2/controllers/listingcontroller.py b/r2/r2/controllers/listingcontroller.py index cb8ef7e37..55776f32b 100755 --- a/r2/r2/controllers/listingcontroller.py +++ b/r2/r2/controllers/listingcontroller.py @@ -589,6 +589,7 @@ class UserController(ListingController): titles = {'overview': _("overview for %(user)s"), 'comments': _("comments by %(user)s"), 'submitted': _("submitted by %(user)s"), + 'gilded': _("gilded comments by %(user)s"), 'liked': _("liked by %(user)s"), 'disliked': _("disliked by %(user)s"), 'saved': _("saved by %(user)s"), @@ -619,6 +620,9 @@ class UserController(ListingController): return False if self.where == 'saved' and not item.saved: return False + if self.where == 'gilded': + wouldkeep = item.gildings > 0 + return wouldkeep and (getattr(item, "promoted", None) is None and (self.where == "deleted" or not getattr(item, "deleted", False))) @@ -640,6 +644,11 @@ class UserController(ListingController): self.check_modified(self.vuser, 'submitted') q = queries.get_submitted(self.vuser, self.sort, self.time) + elif self.where == 'gilded': + sup.set_sup_header(self.vuser, 'gilded') + self.check_modified(self.vuser, 'gilded') + q = queries.get_gilded_user_comments(self.vuser) + elif self.where in ('liked', 'disliked'): sup.set_sup_header(self.vuser, self.where) self.check_modified(self.vuser, self.where) diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 915fa338f..7aeb5ba7f 100755 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -1549,7 +1549,8 @@ class ProfilePage(Reddit): path = "/user/%s/" % self.user.name main_buttons = [NavButton(menu.overview, '/', aliases = ['/overview']), NamedButton('comments'), - NamedButton('submitted')] + NamedButton('submitted'), + NamedButton('gilded')] if votes_visible(self.user): main_buttons += [NamedButton('liked'),