From 339f0b55178b428d9e85afa23b446064e24be962 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Wed, 20 May 2020 09:30:56 +0800 Subject: [PATCH] ADD repo_id with get repository api --- app/controllers/repositories_controller.rb | 2 +- app/views/repositories/show.json.jbuilder | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index bb4506b94..76435d6a4 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -2,7 +2,7 @@ class RepositoriesController < ApplicationController include ApplicationHelper include OperateProjectAbilityAble before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror] - before_action :find_project, :authorizate!, except: :tags + before_action :find_project, :authorizate!, except: [:sync_mirror, :tags] before_action :find_repository, only: %i[sync_mirror tags] before_action :authorizate_user_can_edit_project!, only: %i[sync_mirror] diff --git a/app/views/repositories/show.json.jbuilder b/app/views/repositories/show.json.jbuilder index 5b449fd18..8c9c8cc82 100644 --- a/app/views/repositories/show.json.jbuilder +++ b/app/views/repositories/show.json.jbuilder @@ -1,13 +1,14 @@ json.identifier @project.identifier json.name @project.name json.project_id @project.id +json.repo_id @project.repository.id json.issues_count @project.issues_count json.pull_requests_count @project.pull_requests_count json.project_identifier @project.identifier json.praises_count @project.praises_count.to_i json.forked_count @project.forked_count.to_i json.watchers_count @project.watchers_count.to_i -json.versions_count @project.versions_count #里程碑数量 +json.versions_count @project.versions_count #里程碑数量 json.version_releases_count @project.releases_size(current_user.try(:id), "all") json.version_releasesed_count @project.releases_size(current_user.try(:id), "released") #已发行的版本 json.contributor_users_count @project.contributor_users @@ -18,6 +19,7 @@ json.permission render_edit_project_permission(current_user, @project) if curren json.mirror_url @project&.repository.mirror_url json.watched current_user&.watched?(@project) json.praised current_user&.liked?(@project) +json.status @project.status json.forked_from_project_id @project_fork_id json.fork_info do if @fork_project.present?