From 74e5fa0e317436e2a48693d44b6850627a1557d3 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 29 Nov 2021 17:01:39 +0800 Subject: [PATCH 1/5] fix: fork project id validate --- app/services/pull_requests/create_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/pull_requests/create_service.rb b/app/services/pull_requests/create_service.rb index 1080c540c..cc7493ea8 100644 --- a/app/services/pull_requests/create_service.rb +++ b/app/services/pull_requests/create_service.rb @@ -150,7 +150,7 @@ class PullRequests::CreateService < ApplicationService raise "title参数不能为空" if @params[:title].blank? raise "head参数不能为空" if @params[:head].blank? raise "base参数不能为空" if @params[:base].blank? - raise "fork_project_id参数错误" unless @project.forked_projects.pluck(:id).include?(@params[:fork_project_id]) + raise "fork_project_id参数错误" if is_original && !@project.forked_projects.pluck(:id).include?(@params[:fork_project_id].to_i) raise "分支内容相同，无需创建合并请求" if @params[:head] === @params[:base] && !is_original raise "合并请求已存在" if @project&.pull_requests.where(head: @params[:head], base: @params[:base], status: 0, is_original: is_original, fork_project_id: @params[:fork_project_id]).present? raise @pull_issue.errors.full_messages.join(", ") unless pull_issue.valid? From 7a93db9ed24c08083b9bc59299bc4f0ab150c11e Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 30 Nov 2021 13:58:51 +0800 Subject: [PATCH 2/5] fix: labels limit and issues operate field --- app/controllers/issue_tags_controller.rb | 6 +++--- app/controllers/issues_controller.rb | 1 + app/views/issues/index.json.jbuilder | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/issue_tags_controller.rb b/app/controllers/issue_tags_controller.rb index 7b3b54a89..011735ff7 100644 --- a/app/controllers/issue_tags_controller.rb +++ b/app/controllers/issue_tags_controller.rb @@ -17,7 +17,7 @@ class IssueTagsController < ApplicationController def create - title = params[:name].to_s.strip.first(10) + title = params[:name].to_s.strip.first(15) desc = params[:description].to_s.first(30) color = params[:color] || "#ccc" @@ -60,8 +60,8 @@ class IssueTagsController < ApplicationController end def update - title = params[:name] - desc = params[:description] + title = params[:name].to_s.strip.first(15) + desc = params[:description].to_s.first(30) color = params[:color] || "#ccc" tag_params = { diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 96e186b42..6ea8fb8ef 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -15,6 +15,7 @@ class IssuesController < ApplicationController include TagChosenHelper def index + @user_operate_issue = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user)) @user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user) || @project.is_public?) issues = @project.issues.issue_issue.issue_index_includes issues = issues.where(is_private: false) unless @user_admin_or_member diff --git a/app/views/issues/index.json.jbuilder b/app/views/issues/index.json.jbuilder index 0f778fafe..8db3524ed 100644 --- a/app/views/issues/index.json.jbuilder +++ b/app/views/issues/index.json.jbuilder @@ -7,6 +7,7 @@ json.my_published_count @my_published.size json.search_count @issues_size json.limit @limit json.user_admin_or_member @user_admin_or_member +json.user_operate_issue @user_operate_issue json.issues do json.array! @issues.to_a do |issue| From a7d681c4dd3e2c6965a3702043142d2511a24454 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 30 Nov 2021 15:03:55 +0800 Subject: [PATCH 3/5] fix: compare commit author image url --- app/views/compare/show.json.jbuilder | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/views/compare/show.json.jbuilder b/app/views/compare/show.json.jbuilder index 0037d8be8..deca41037 100644 --- a/app/views/compare/show.json.jbuilder +++ b/app/views/compare/show.json.jbuilder @@ -3,19 +3,11 @@ json.commits_count @compare_result['Commits']&.size json.commits do json.array! @compare_result['Commits'] do |commit| json.author do - # TODO: 获取头像地址待优化 - forge_user = User.includes(:user_extension).find_by(login: commit['Author']['Name']) - json.login commit['Author']['Name'] - json.name commit['Author']['Name'] - json.image_url forge_user.nil? ? '' : url_to_avatar(forge_user) + json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] } end json.committer do - # TODO: 获取头像地址待优化 - forge_user = User.includes(:user_extension).find_by(login: commit['Committer']['Name']) - json.login commit['Committer']['Name'] - json.name commit['Committer']['Name'] - json.image_url forge_user.nil? ? '' : url_to_avatar(forge_user) + json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] } end json.timestamp render_unix_time(commit['Committer']['When']) json.time_from_now time_from_now(commit['Committer']['When']) From d588a78f6291729ca3ee773ae85ba82ba0603e5c Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 30 Nov 2021 15:35:36 +0800 Subject: [PATCH 4/5] fix: locales for projects update form --- config/locales/forms/projects_create_form.zh-CN.yml | 2 +- config/locales/forms/projects_update_form.zh-CN.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/locales/forms/projects_create_form.zh-CN.yml b/config/locales/forms/projects_create_form.zh-CN.yml index e36a0520a..9df1e2d04 100644 --- a/config/locales/forms/projects_create_form.zh-CN.yml +++ b/config/locales/forms/projects_create_form.zh-CN.yml @@ -3,5 +3,5 @@ attributes: projects/create_form: name: 项目名称 - repository_name: 仓库名称 + repository_name: 项目标识 description: 项目简介 \ No newline at end of file diff --git a/config/locales/forms/projects_update_form.zh-CN.yml b/config/locales/forms/projects_update_form.zh-CN.yml index 74804f6af..74bbf8a0a 100644 --- a/config/locales/forms/projects_update_form.zh-CN.yml +++ b/config/locales/forms/projects_update_form.zh-CN.yml @@ -3,6 +3,7 @@ attributes: projects/update_form: name: 项目名称 + identifier: 项目标识 description: 项目简介 project_category_id: 项目类别 project_language_id: 项目语言 \ No newline at end of file From 4e3c8e414c8466713885566e32adccc684ed6aed Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 30 Nov 2021 15:36:51 +0800 Subject: [PATCH 5/5] fix --- config/locales/forms/projects_create_form.zh-CN.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/forms/projects_create_form.zh-CN.yml b/config/locales/forms/projects_create_form.zh-CN.yml index 9df1e2d04..e36a0520a 100644 --- a/config/locales/forms/projects_create_form.zh-CN.yml +++ b/config/locales/forms/projects_create_form.zh-CN.yml @@ -3,5 +3,5 @@ attributes: projects/create_form: name: 项目名称 - repository_name: 项目标识 + repository_name: 仓库名称 description: 项目简介 \ No newline at end of file