From 062a47d889ba52840353137057eb0958bd61d312 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Mon, 29 Jun 2020 18:26:22 +0800 Subject: [PATCH] Update get simpe project api --- app/controllers/projects_controller.rb | 3 +-- app/helpers/projects_helper.rb | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index fdda05dee..20752bb1e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -100,8 +100,7 @@ class ProjectsController < ApplicationController end def simple - project = Project.includes(:owner).select(:id, :name, :identifier, :user_id).find params[:id] - + project = Project.includes(:owner, :repository).select(:id, :name, :identifier, :user_id, :project_type).find params[:id] json_response(project) end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 7079ae936..aeae32158 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -29,7 +29,17 @@ module ProjectsHelper end def json_response(project) - json = { + repo = project.repository + tmp_json = {} + unless project.common? + tmp_json = tmp_json.merge({ + mirror_status: repo.mirror_status, + mirror_num: repo.mirror_num, + first_sync: repo.first_sync? + }) + end + + tmp_json = tmp_json.merge({ identifier: project.identifier, name: project.name, id: project.id, @@ -38,7 +48,7 @@ module ProjectsHelper name: project.owner.real_name, image_url: url_to_avatar(project.owner) } - } - render json: json + }).compact + render json: tmp_json end end