diff --git a/app/controllers/pool_controller.rb b/app/controllers/pool_controller.rb index 7a23283e..a94122c2 100644 --- a/app/controllers/pool_controller.rb +++ b/app/controllers/pool_controller.rb @@ -115,7 +115,8 @@ class PoolController < ApplicationController :order => "nat_sort(pools_posts.sequence), pools_posts.post_id", :joins => "JOIN pools_posts ON posts.id = pools_posts.post_id", :conditions => [conds.join(" AND "), *cond_params], - :select => "posts.*, pools_posts.sequence AS sequence", + :select => "posts.*, + pools_posts.pool_id AS pool_pool_id, pools_posts.sequence AS pool_sequence, pools_posts.next_post_id AS pool_next_post_id, pools_posts.prev_post_id AS pool_prev_post_id", :page => params[:page], } diff --git a/app/models/post/api_methods.rb b/app/models/post/api_methods.rb index 79681a2b..988085c9 100644 --- a/app/models/post/api_methods.rb +++ b/app/models/post/api_methods.rb @@ -40,7 +40,13 @@ module PostApiMethods # If we're being formatted as the contents of a pool, we'll have the pool_post # sequence loaded too. - ret[:sequence] = sequence if self.respond_to?("sequence") + if self.respond_to?("pool_sequence") then + ret[:pool_post] = {} + ret[:pool_post][:pool_id] = pool_pool_id + ret[:pool_post][:next_post_id] = pool_next_post_id + ret[:pool_post][:prev_post_id] = pool_prev_post_id + ret[:pool_post][:sequence] = pool_sequence + end return ret end diff --git a/app/models/post/sql_methods.rb b/app/models/post/sql_methods.rb index c32b52bb..a0661d69 100644 --- a/app/models/post/sql_methods.rb +++ b/app/models/post/sql_methods.rb @@ -270,7 +270,7 @@ module PostSqlMethods # If we're searching in a pool, include the pool_post sequence in API output. if q.has_key?(:pool) - sql << ", pools_posts.sequence AS sequence" + sql << ", pools_posts.pool_id AS pool_pool_id, pools_posts.sequence AS pool_sequence, pools_posts.next_post_id AS pool_next_post_id, pools_posts.prev_post_id AS pool_prev_post_id" end end