FIX update projects api

dev_forge
Jasder 5 years ago
parent 3ae58b3989
commit 7f9ed9992e

@ -603,7 +603,7 @@ class ApplicationController < ActionController::Base
end end
def paginate(relation) def paginate(relation)
limit = params[:limit].to_i.zero? ? 20 : params[:limit].to_i limit = params[:limit].to_i.zero? ? 15 : params[:limit].to_i
page = params[:page].to_i.zero? ? 1 : params[:page].to_i page = params[:page].to_i.zero? ? 1 : params[:page].to_i
offset = (page - 1) * limit offset = (page - 1) * limit

@ -4,6 +4,7 @@ class ProjectsController < ApplicationController
def index def index
scope = Projects::ListQuery.call(params) scope = Projects::ListQuery.call(params)
@total_count = scope.size
@projects = paginate(scope) @projects = paginate(scope)
end end

@ -1,23 +1,26 @@
json.array! @projects do |project| json.total_count @total_count
json.partial! 'project', project: project json.projects do
json.author do json.array! @projects do |project|
json.name project.owner.login json.partial! 'project', project: project
json.image_url url_to_avatar(project.owner) json.author do
end json.name project.owner.login
json.category do json.image_url url_to_avatar(project.owner)
if project.project_category.blank?
json.nil!
else
json.id project.project_category.id
json.name project.project_category.name
end end
end json.category do
json.language do if project.project_category.blank?
if project.project_language.blank? json.nil!
json.nil! else
else json.id project.project_category.id
json.id project.project_language.id json.name project.project_category.name
json.name project.project_language.name end
end
json.language do
if project.project_language.blank?
json.nil!
else
json.id project.project_language.id
json.name project.project_language.name
end
end end
end end
end end

Loading…
Cancel
Save