From 11743355ef7313664cebda435b3fe7df309a55ae Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 21 Aug 2024 11:00:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fixed=20=E9=A1=B9=E7=9B=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/concerns/matchable.rb | 1 + app/queries/projects/list_query.rb | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/matchable.rb b/app/models/concerns/matchable.rb index 0640e7c74..27e5a0dda 100644 --- a/app/models/concerns/matchable.rb +++ b/app/models/concerns/matchable.rb @@ -7,6 +7,7 @@ module Matchable scope :with_project_type, ->(project_type) { where(project_type: project_type) if Project.project_types.include?(project_type) } scope :by_name_or_identifier, ->(search) { where("name like :search or identifier LIKE :search", :search => "%#{search.split(" ").join('|')}%") unless search.blank? } scope :with_project_topic, ->(topic_id) {joins(:project_topics).where(project_topics: {id: topic_id}) unless topic_id.blank?} + scope :with_project_topic_name, ->(topic_name) {joins(:project_topics).where(project_topics: {name: topic_name}) unless topic_name.blank?} end end diff --git a/app/queries/projects/list_query.rb b/app/queries/projects/list_query.rb index 09a02010c..737cd7c2d 100644 --- a/app/queries/projects/list_query.rb +++ b/app/queries/projects/list_query.rb @@ -77,7 +77,11 @@ class Projects::ListQuery < ApplicationQuery end def by_project_topic(items) - items.with_project_topic(params[:topic_id]) + if params[:topic_name].present? + items.with_project_topic_name(params[:topic_name].to_s.split(",")) + else + items.with_project_topic(params[:topic_id]) + end end # 优化排序 From 771798220cb10c9d71ad5b2b62cbbf61da0d155e Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 23 Aug 2024 10:02:07 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE=E6=9C=8D=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 2 +- app/forms/projects/migrate_form.rb | 2 +- app/services/gitea/accelerator/migrate_service.rb | 1 + app/services/projects/migrate_service.rb | 1 + app/services/repositories/migrate_service.rb | 3 ++- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d3e308450..ab7f1cdc6 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -395,7 +395,7 @@ class ProjectsController < ApplicationController end def mirror_params - params.permit(:user_id, :name, :description, :repository_name, :is_mirror, :auth_username, :auth_token, + params.permit(:user_id, :name, :description, :repository_name, :is_mirror, :auth_username, :auth_token, :service, :auth_password, :project_category_id, :project_language_id, :clone_addr, :private) end diff --git a/app/forms/projects/migrate_form.rb b/app/forms/projects/migrate_form.rb index 8c1d04968..543f996d8 100644 --- a/app/forms/projects/migrate_form.rb +++ b/app/forms/projects/migrate_form.rb @@ -1,5 +1,5 @@ class Projects::MigrateForm < BaseForm - attr_accessor :user_id, :name, :repository_name, :project_category_id, :description, :auth_token, + attr_accessor :user_id, :name, :repository_name, :project_category_id, :description, :auth_token, :service :project_language_id, :clone_addr, :private, :is_mirror, :auth_username, :auth_password, :owner validates :user_id, :name, :repository_name, :clone_addr, presence: true diff --git a/app/services/gitea/accelerator/migrate_service.rb b/app/services/gitea/accelerator/migrate_service.rb index 86b8b3db1..5de97fe70 100644 --- a/app/services/gitea/accelerator/migrate_service.rb +++ b/app/services/gitea/accelerator/migrate_service.rb @@ -45,6 +45,7 @@ class Gitea::Accelerator::MigrateService < Gitea::Accelerator::BaseService repo_name: params[:repository_name], auth_username: params[:auth_username], auth_password: Base64.decode64(params[:auth_password]), + auth_token: params[:auth_token], mirror: ActiveModel::Type::Boolean.new.cast(params[:is_mirror]) } end diff --git a/app/services/projects/migrate_service.rb b/app/services/projects/migrate_service.rb index f157ada1d..d81e24189 100644 --- a/app/services/projects/migrate_service.rb +++ b/app/services/projects/migrate_service.rb @@ -55,6 +55,7 @@ class Projects::MigrateService < ApplicationService login: params[:auth_username], password: params[:auth_password], auth_token: params[:auth_token], + service: params[:service], is_mirror: params[:is_mirror], source_clone_url: params[:source_clone_url] } diff --git a/app/services/repositories/migrate_service.rb b/app/services/repositories/migrate_service.rb index deb0e30d3..e423fe164 100644 --- a/app/services/repositories/migrate_service.rb +++ b/app/services/repositories/migrate_service.rb @@ -33,7 +33,8 @@ class Repositories::MigrateService < ApplicationService mirror: wrapper_mirror || false, auth_username: params[:login], auth_password: Base64.decode64(params[:password] || ""), - auth_token: params[:auth_token] + auth_token: params[:auth_token], + service: params[:service] || 'git', } end From 655ac8ec67ccddf7092db8c9fab17ff2cdf8a0f3 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 23 Aug 2024 16:04:04 +0800 Subject: [PATCH 3/5] fix --- app/forms/projects/migrate_form.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/forms/projects/migrate_form.rb b/app/forms/projects/migrate_form.rb index 543f996d8..1a1c5c389 100644 --- a/app/forms/projects/migrate_form.rb +++ b/app/forms/projects/migrate_form.rb @@ -1,5 +1,5 @@ class Projects::MigrateForm < BaseForm - attr_accessor :user_id, :name, :repository_name, :project_category_id, :description, :auth_token, :service + attr_accessor :user_id, :name, :repository_name, :project_category_id, :description, :auth_token, :service, :project_language_id, :clone_addr, :private, :is_mirror, :auth_username, :auth_password, :owner validates :user_id, :name, :repository_name, :clone_addr, presence: true From 2ee2a5f3f362420eb0aaeb6f6f90e1552a049c3e Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 23 Aug 2024 16:14:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Arepository=20ser?= =?UTF-8?q?vice=E4=B8=8D=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/repositories/migrate_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/repositories/migrate_service.rb b/app/services/repositories/migrate_service.rb index e423fe164..4c3d4668d 100644 --- a/app/services/repositories/migrate_service.rb +++ b/app/services/repositories/migrate_service.rb @@ -21,7 +21,7 @@ class Repositories::MigrateService < ApplicationService private def repository_params - params.merge(project_id: project.id) + params.except(:service).merge(project_id: project.id) end def gitea_repository_params From 9c2990e3f8c2d49957abfa2170d3293a6ce71a16 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 27 Aug 2024 16:31:56 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=8F=8D=E9=A6=88=E8=BE=93=E5=85=A5=E6=A1=86=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/admin.scss | 7 +++++++ app/views/admins/feedbacks/_history_form_modal.html.erb | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 8719d767e..7b0ee0300 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -40,6 +40,13 @@ body { } } } +.editormd .CodeMirror{ + margin-top: 35px!important; +} + +.CodeMirror-gutter .CodeMirror-linenumbers { + width: 28px!important; +} input.form-control { font-size: 14px; diff --git a/app/views/admins/feedbacks/_history_form_modal.html.erb b/app/views/admins/feedbacks/_history_form_modal.html.erb index df12a73d3..c5304bfc4 100644 --- a/app/views/admins/feedbacks/_history_form_modal.html.erb +++ b/app/views/admins/feedbacks/_history_form_modal.html.erb @@ -2,7 +2,12 @@
-
发送邮件给<%= @feedback&.user&.mail%>
+
+ 发送邮件给<%= @feedback&.user&.mail%> + <% if @feedback&.user&.mail.end_with?('@example.org') || @feedback&.user&.mail.end_with?('@gitlink.org.cn')%> + (该邮箱不可用) + <% end %> +