jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #1410; fix user argument for favorite post set

Browse Source
This commit is contained in:
Toks
2013-05-05 07:36:07 -04:00
parent 26c774bd84
commit acfbf260aa
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/favorites_controller.rb
View File

@@ -1,13 +1,18 @@
class FavoritesController < ApplicationController class FavoritesController < ApplicationController
before_filter :member_only before_filter :member_only
respond_to :html, :xml, :json
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 params[:user_id]
@favorite_set = PostSets::Favorite.new(User.find(params[:user_id]), params[:page], params)
else else
@favorite_set = PostSets::Favorite.new(CurrentUser.user, params[:page], params) user_id = params[:user_id] || CurrentUser.user.id
@favorite_set = PostSets::Favorite.new(user_id, params[:page], params)
respond_with(@favorite_set.posts) do |format|
format.xml do
render :xml => @favorite_set.posts.to_xml(:root => "posts")
end
end
end end
end end