From b162b3357a979fbd7ecc6f8a18afce32a7509ce8 Mon Sep 17 00:00:00 2001 From: jasder Date: Fri, 7 May 2021 14:06:40 +0800 Subject: [PATCH] FIX get mirror url bug --- app/helpers/projects_helper.rb | 2 +- app/models/repository.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index c220701a1..226096c24 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -41,7 +41,7 @@ module ProjectsHelper tmp_json = tmp_json.merge({ mirror_status: repo.mirror_status, mirror_num: repo.mirror_num, - mirror_url: repo.source_clone_url || repo.mirror_url, + mirror_url: repo.remote_mirror_url, first_sync: repo.first_sync? }) end diff --git a/app/models/repository.rb b/app/models/repository.rb index f4556cea1..0daa4b916 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -78,4 +78,9 @@ class Repository < ApplicationRecord end end + def remote_mirror_url + source_clone_url.blank? ? mirror_url : source_clone_url + end + + end