diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 58f8a7aef..50cb07701 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -148,7 +148,7 @@ location.href = href; } } else { - var href = $("#pool-nav a.active[rel=prev]").attr("href"); + var href = $("#pool-nav a.active[rel=prev], #favgroup-nav a.active[rel=prev]").attr("href"); if (href) { location.href = href; } @@ -160,7 +160,7 @@ var href = $("#search-seq-nav a[rel=next]").attr("href"); location.href = href; } else { - var href = $("#pool-nav a.active[rel=next]").attr("href"); + var href = $("#pool-nav a.active[rel=next], #favgroup-nav a.active[rel=next]").attr("href"); if (href) { location.href = href; } diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb index 6c29a1e87..81a518fe7 100644 --- a/app/presenters/post_presenter.rb +++ b/app/presenters/post_presenter.rb @@ -235,7 +235,7 @@ class PostPresenter < Presenter first = true pools = @post.pools.series_first pools.each do |pool| - if first && template.params[:tags].blank? + if first && template.params[:tags].blank? && template.params[:favgroup_id].blank? html += pool_link_html(template, pool, :include_rel => true) first = false else diff --git a/app/views/posts/partials/show/_favorite_groups.html.erb b/app/views/posts/partials/show/_favorite_groups.html.erb index 738979b88..f962ae62c 100644 --- a/app/views/posts/partials/show/_favorite_groups.html.erb +++ b/app/views/posts/partials/show/_favorite_groups.html.erb @@ -2,18 +2,20 @@