diff --git a/r2/r2/lib/pages/things.py b/r2/r2/lib/pages/things.py index fcf9785c4..48352629b 100644 --- a/r2/r2/lib/pages/things.py +++ b/r2/r2/lib/pages/things.py @@ -149,6 +149,8 @@ class CommentButtons(PrintableButtons): is_author = is_author, profilepage = c.profilepage, permalink = thing.permalink, + new_window = c.user.pref_newwindow, + full_comment_path = thing.full_comment_path, deleted = thing.deleted, parent_permalink = thing.parent_permalink, can_reply = thing.can_reply, diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py index b237af141..def6dfedd 100644 --- a/r2/r2/models/link.py +++ b/r2/r2/models/link.py @@ -781,13 +781,15 @@ class Comment(Thing, Printable): if site != item.subreddit: item.subreddit_path += item.subreddit.path + item.full_comment_path = item.link.make_permalink(item.subreddit) + # don't collapse for admins, on profile pages, or if deleted item.collapsed = False if ((item.score < min_score) and not (profilepage or item.deleted or user_is_admin)): item.collapsed = True item.collapsed_reason = _("comment score below threshold") - if c.user_is_loggedin and item.author_id in c.user.enemies: + if user_is_loggedin and item.author_id in c.user.enemies: if "grayed" not in extra_css: extra_css += " grayed" item.collapsed = True diff --git a/r2/r2/templates/printablebuttons.html b/r2/r2/templates/printablebuttons.html index c2e89c3e2..4b8a183c4 100644 --- a/r2/r2/templates/printablebuttons.html +++ b/r2/r2/templates/printablebuttons.html @@ -252,6 +252,13 @@
  • ${self.bylink_button(_("context"), thing.permalink + "?context=3")}
  • +
  • + ${self.comment_button("comment", "full comments", + thing.full_comment_path, + _sr_path = True, + a_class = None, + newwindow = thing.new_window)} +
  • %endif %if thing.deleted: %if thing.parent_permalink and not thing.profilepage: