From 8c2a543e612c9137b0272c8b830856cfbf6e2853 Mon Sep 17 00:00:00 2001 From: "vilet.yy" Date: Mon, 22 Mar 2021 11:16:35 +0800 Subject: [PATCH 1/3] fix: project code change to default --- app/controllers/repositories_controller.rb | 1 - 1 file changed, 1 deletion(-) 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) From 8bbfea20791b6a1ffe3a4b47a4e542cd11120389 Mon Sep 17 00:00:00 2001 From: "vilet.yy" Date: Mon, 22 Mar 2021 11:18:04 +0800 Subject: [PATCH 2/3] fix --- app/controllers/projects_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = From 5c864acb64d038eec1c6312927a458cbee41b23b Mon Sep 17 00:00:00 2001 From: "vilet.yy" Date: Mon, 22 Mar 2021 15:50:08 +0800 Subject: [PATCH 3/3] fix: create repo not use website --- app/services/projects/create_service.rb | 1 - 1 file changed, 1 deletion(-) 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