From f8a6f62342a18cd0e1f0b293e6cbdf70df8c688e Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 10 Dec 2021 09:35:03 +0800 Subject: [PATCH 1/2] fix: project rank include educoder --- app/views/project_rank/_detail.json.jbuilder | 27 ++++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/app/views/project_rank/_detail.json.jbuilder b/app/views/project_rank/_detail.json.jbuilder index b23403966..5e45f518e 100644 --- a/app/views/project_rank/_detail.json.jbuilder +++ b/app/views/project_rank/_detail.json.jbuilder @@ -3,15 +3,26 @@ owner_common = $redis_cache.hgetall("v2-owner-common:#{project_common["owner_id" json.id item[0] json.score item[1] json.name project_common["name"] -json.identifier project_common["identifier"] -json.description project_common["description"] -json.owner do - json.id project_common["owner_id"] - json.type owner_common["type"] - json.name owner_common["name"] - json.login owner_common["login"] - json.avatar_url owner_common["avatar_url"] +if project_common['identifier'].include?("/") + json.identifier project_common["identifier"].split('/')[1] + json.owner do + json.id nil + json.type 'User' + json.name project_common["identifier"].split('/')[0] + json.login project_common["identifier"].split('/')[0] + json.avatar_url User::Avatar.get_letter_avatar_url(project_common["identifier"].split('/')[0]) + end +else + json.identifier project_common["identifier"] + json.owner do + json.id project_common["owner_id"] + json.type owner_common["type"] + json.name owner_common["name"] + json.login owner_common["login"] + json.avatar_url owner_common["avatar_url"] + end end +json.description project_common["description"] json.visits project_common["visits"] json.forks project_common["forks"] json.watchers project_common["watchers"] From 1faaf1d7d13b7ee14ca00bc33bed5cf8803d108e Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 13 Dec 2021 11:45:58 +0800 Subject: [PATCH 2/2] fix: project menu list wiki location --- app/controllers/projects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3bb04e873..77b818cad 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -17,9 +17,9 @@ class ProjectsController < ApplicationController menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("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") && @project.forge? - menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki") && @project.forge? menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") && @project.forge? menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions") + menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki") && @project.forge? menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources") && @project.forge? menu.append(menu_hash_by_name("activity")) menu.append(menu_hash_by_name("settings")) if (current_user.admin? || @project.manager?(current_user)) && @project.forge?