comment threshold link now hitting the correct action

This commit is contained in:
albert
2011-09-11 15:15:16 -04:00
parent ff4e3e3ad1
commit 7483ad2e28
4 changed files with 12 additions and 0 deletions

View File

@@ -5,6 +5,8 @@ class CommentsController < ApplicationController
def index
if params[:group_by] == "post"
index_by_post
elsif request.format == Mime::JS
index_for_post
else
index_by_comment
end
@@ -35,6 +37,13 @@ class CommentsController < ApplicationController
end
private
def index_for_post
@post = Post.find(params[:post_id])
@comments = @post.comments
@comments = @comments.visible unless params[:include_hidden]
render :action => "index_for_post"
end
def index_by_post
@posts = Post.commented_before(Time.now).tag_match(params[:tags]).paginate(params[:page])
respond_with(@posts) do |format|

View File

@@ -12,6 +12,7 @@ class Comment < ActiveRecord::Base
scope :recent, :order => "comments.id desc", :limit => 6
scope :body_matches, lambda {|query| where("body_index @@ plainto_tsquery(?)", query).order("comments.id DESC")}
scope :hidden, lambda {|user| where("score < ?", user.comment_threshold)}
scope :visible, lambda {|user| where("score >= ?", user.comment_threshold)}
scope :post_tag_match, lambda {|query| joins(:post).where("posts.tag_index @@ to_tsquery('danbooru', ?)", query)}
scope :for_user, lambda {|user_id| where("creator_id = ?", user_id)}

View File

@@ -0,0 +1 @@
$("div.comments-for-post[data-post-id=<%= @post.id %>] div.notices").hide();

View File

@@ -0,0 +1 @@
window.location.reload();