fixes #449
This commit is contained in:
@@ -4,6 +4,8 @@ class FavoritesController < ApplicationController
|
|||||||
def index
|
def index
|
||||||
if params[:tags]
|
if params[:tags]
|
||||||
redirect_to(posts_path(:tags => params[:tags]))
|
redirect_to(posts_path(:tags => params[:tags]))
|
||||||
|
elsif request.format == Mime::JS
|
||||||
|
list_favorited_users
|
||||||
else
|
else
|
||||||
@favorite_set = PostSets::Favorite.new(CurrentUser.user, params[:page], params)
|
@favorite_set = PostSets::Favorite.new(CurrentUser.user, params[:page], params)
|
||||||
end
|
end
|
||||||
@@ -22,4 +24,9 @@ class FavoritesController < ApplicationController
|
|||||||
@post = Post.find(params[:id])
|
@post = Post.find(params[:id])
|
||||||
@post.remove_favorite!(CurrentUser.user)
|
@post.remove_favorite!(CurrentUser.user)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def list_favorited_users
|
||||||
|
@post = Post.find(params[:post_id])
|
||||||
|
render :action => "list_favorited_users"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -543,6 +543,10 @@ class Post < ActiveRecord::Base
|
|||||||
def favorited_user_ids
|
def favorited_user_ids
|
||||||
fav_string.scan(/\d+/)
|
fav_string.scan(/\d+/)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def favorited_users
|
||||||
|
favorited_user_ids.map {|id| User.find_by_id(id)}
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
module UploaderMethods
|
module UploaderMethods
|
||||||
|
|||||||
1
app/views/favorites/_favorited_users_list.html.erb
Normal file
1
app/views/favorites/_favorited_users_list.html.erb
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<br><%= post.favorited_users.reverse_each.map{|user| link_to_user(user)}.join(", ").html_safe %>
|
||||||
1
app/views/favorites/list_favorited_users.js.erb
Normal file
1
app/views/favorites/list_favorited_users.js.erb
Normal file
@@ -0,0 +1 @@
|
|||||||
|
$("span#favlist-for-post-<%= @post.id %>").html("<%= j(render(:partial => "favorites/favorited_users_list", :locals => { :post => @post }))%>");
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
<li>Source: <%= post_source_tag(post) %></li>
|
<li>Source: <%= post_source_tag(post) %></li>
|
||||||
<li>Rating: <%= post.pretty_rating %></li>
|
<li>Rating: <%= post.pretty_rating %></li>
|
||||||
<li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_privileged? %>(vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %>)<% end %></li>
|
<li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_privileged? %>(vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %>)<% end %></li>
|
||||||
<li>Favorites: <span id="favcount-for-post-<%= post.id %>"><%= post.fav_count %></span></li>
|
<li>Favorites: <span id="favcount-for-post-<%= post.id %>"><%= post.fav_count %></span> <% if CurrentUser.is_privileged? && post.fav_count > 0 %><span id="favlist-for-post-<%= post.id %>"><%= link_to "»".html_safe, favorites_path(:post_id => post.id), :remote => true %></span><% end %></li>
|
||||||
<li>
|
<li>
|
||||||
Status:
|
Status:
|
||||||
<% if post.is_pending? %>
|
<% if post.is_pending? %>
|
||||||
|
|||||||
Reference in New Issue
Block a user