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

merge pool category branch; fixes #1521

Browse Source
This commit is contained in:
Toks
2013-05-26 08:23:46 -04:00
parent 240b160b8a 1ee492c97b
commit ce39e45594
8 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/presenters/post_presenter.rb
View File

@@ -161,12 +161,14 @@ class PostPresenter < Presenter
return if pool.nil?
html += pool_link_html(template, pool, :include_rel => true)
@post.pools.active.where("id <> ?", template.params[:pool_id]).each do |other_pool|
other_pools = @post.pools.where("id <> ?", template.params[:pool_id]).series_first
other_pools.each do |other_pool|
html += pool_link_html(template, other_pool)
end
else
first = true
@post.pools.each do |pool|
pools = @post.pools.series_first
pools.each do |pool|
if first && template.params[:tags].blank?
html += pool_link_html(template, pool, :include_rel => true)
first = false
@@ -187,11 +189,11 @@ class PostPresenter < Presenter
if options[:include_rel]
prev_rel = "prev"
next_rel = "next"
klass = "active"
klass = "active pool-category-#{pool.category}"
else
prev_rel = nil
next_rel = nil
klass = ""
klass = "pool-category-#{pool.category}"
end
if @post.id != pool.post_id_array.first