diff --git a/app/controllers/concerns/paginator.rb b/app/controllers/concerns/paginator.rb index 38dda601b1351ee381bad672799ccaec8eb90aa5..af015ff08cf386bb3a8a6fff7f96e8a8567cfe90 100644 --- a/app/controllers/concerns/paginator.rb +++ b/app/controllers/concerns/paginator.rb @@ -38,7 +38,7 @@ module Paginator def offset return params[:offset].to_i if !params[:offset].blank? - return params[:page].to_i*params[:results_per_page].to_i if !params[:page].blank? && !params[:results_per_page].blank? + return params[:page].to_i*limit if !params[:page].blank? return 0 end diff --git a/app/controllers/concerns/reviewable_controller.rb b/app/controllers/concerns/reviewable_controller.rb index 4b3eabe810f93288bb5fd4ba2a1cd632083606a4..b6b794847385feba8a1ace067de17bfff8991a69 100644 --- a/app/controllers/concerns/reviewable_controller.rb +++ b/app/controllers/concerns/reviewable_controller.rb @@ -29,7 +29,7 @@ module ReviewableController # GET /v1/collections/1/reviews def index - render json: Review.where(reviewable: reviewable) + render json: paginate(Review.where(reviewable: reviewable)), each_serializer: ReviewSerializer end # GET /v1/collections/1/reviews/1 diff --git a/app/controllers/v1/reviews_controller.rb b/app/controllers/v1/reviews_controller.rb index 9f8fe1559d3f94543fcbde7bfbe39643025cb552..2ca13cecf276ac39dd13cc3934bdd0e36b12b054 100644 --- a/app/controllers/v1/reviews_controller.rb +++ b/app/controllers/v1/reviews_controller.rb @@ -20,13 +20,14 @@ class V1::ReviewsController < ApplicationController include ::DeletedObjectsController include ::ResourceModel + include ::Paginator before_action :set_review, only: [:show, :destroy, :rate, :update] before_action :authenticate_user!, only: [:create, :rate, :destroy, :update] # GET /v1/collections/1/reviews def index - render json: reviewable.reviews, each_serializer: ReviewSerializer + render json: paginate(reviewable.reviews), each_serializer: ReviewSerializer end # GET /v1/collections/1/reviews/1