diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 978f0d98f..9e617bb3d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -20,6 +20,7 @@ class UsersController < ApplicationController user_projects = User.current.logged? && (User.current.admin? || User.current.login == @user.login) ? @user.projects : @user.projects.visible @projects_common_count = user_projects.common.size @projects_mirrior_count = user_projects.mirror.size + @projects_sync_mirrior_count = user_projects.sync_mirror.size end def watch_users diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 11752809c..b9cd457e3 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -3,7 +3,8 @@ module ProjectsHelper def render_zh_project_type(project_type) case project_type when 'common' then "开源托管项目" - when 'mirror', 'sync_mirror' then "开源镜像项目" + when 'sync_mirror' then "镜像托管项目" + when 'mirror' then "开源镜像项目" end end diff --git a/app/queries/projects/list_my_query.rb b/app/queries/projects/list_my_query.rb index b0522e680..56164f751 100644 --- a/app/queries/projects/list_my_query.rb +++ b/app/queries/projects/list_my_query.rb @@ -44,6 +44,8 @@ class Projects::ListMyQuery < ApplicationQuery projects = projects.common elsif params[:project_type].to_s === "mirror" projects = projects.mirror + elsif params[:project_type].to_s === "sync_mirror" + projects = projects.sync_mirror end q = projects.ransack(name_or_identifier_cont: params[:search]) diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder index 502234316..9b4956197 100644 --- a/app/views/users/show.json.jbuilder +++ b/app/views/users/show.json.jbuilder @@ -13,4 +13,5 @@ json.watching_count @user.follow_count #关注数 json.undo_events @undo_events json.user_composes_count @user_composes_count json.common_projects_count @projects_common_count -json.mirror_projects_count @projects_mirrior_count \ No newline at end of file +json.mirror_projects_count @projects_mirrior_count +json.sync_mirror_projects_count @projects_sync_mirrior_count \ No newline at end of file