diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 573dbba80..1fd858be5 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -11,7 +11,7 @@ class ProjectsController < ApplicationController menu = [] menu.append(menu_hash_by_name("home")) - menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code") + menu.append(menu_hash_by_name("code")) menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues") menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls") menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") @@ -26,7 +26,7 @@ class ProjectsController < ApplicationController scope = Projects::ListQuery.call(params) # @projects = kaminari_paginate(scope) - @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner) + @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units) category_id = params[:category_id] @total_count = diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index b66a53736..cd07803d6 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -18,7 +18,6 @@ class RepositoriesController < ApplicationController # 新版项目详情 def detail - return render_not_found unless @project.has_menu_permission("code") @user = current_user @result = Repositories::DetailService.call(@owner, @repository, @user) @project_fork_id = @project.try(:forked_from_project_id) diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index c6e5b213b..f014b8d7f 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -46,7 +46,6 @@ class Projects::CreateService < ApplicationService { hidden: !repo_is_public, user_id: params[:user_id], - website: params[:website], identifier: params[:repository_name] } end diff --git a/app/views/repositories/detail.json.jbuilder b/app/views/repositories/detail.json.jbuilder index 6980d4b25..e06ccdd85 100644 --- a/app/views/repositories/detail.json.jbuilder +++ b/app/views/repositories/detail.json.jbuilder @@ -1,6 +1,10 @@ json.content @project.content json.website @project.website -json.readme @result[:readme].merge(content: readme_render_decode64_content(@result[:readme]["content"], nil)) +if @result[:readme].blank? + json.readme nil! +else + json.readme @result[:readme].merge(content: readme_render_decode64_content(@result[:readme]["content"], nil)) +end json.identifier render_identifier(@project) json.name @project.name json.project_id @project.id @@ -48,7 +52,7 @@ if @result[:repo] json.private @result[:repo]['private'] end json.license_name @project.license_name -json.release_versions do +json.release_versions do json.list @result[:release].each do |release| forge_version = VersionRelease.find_by(version_gid: release["id"]) json.id forge_version&.id @@ -58,23 +62,23 @@ json.release_versions do end json.total_count @result[:release].size end -json.branches do +json.branches do json.list @result[:branch].each do |branch| json.name branch["name"] end json.total_count @result[:branch].size end -json.tags do - json.list @result[:tag].each do |tag| +json.tags do + json.list @result[:tag].each do |tag| json.name tag["name"] end - json.total_count @result[:tag].size + json.total_count @result[:tag].size end -json.contributors do - total_count = @result[:contributor].size +json.contributors do + total_count = @result[:contributor].size json.list @result[:contributor].each do |contributor| user = User.find_by(gitea_uid: contributor["id"]) - if contributor["login"] == "root" + if contributor["login"] == "root" total_count -= 1 next end