floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX conflict

This commit is contained in:
jasder 2021-03-31 13:35:40 +08:00
parent d2293a2778
commit 5f5b380514
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/settings_controller.rb
View File

@ -22,9 +22,9 @@ class SettingsController < ApplicationController
def get_common_menu def get_common_menu
@common = {} @common = {}
Site.common.select(:url, :key).to_a.map(&:serializable_hash).each do |site| Site.common.select(:url, :key).each do |site|
next if site["url"].to_s.include?("current_user") && !User.current.logged? next if site["url"].to_s.include?("current_user") && !User.current.logged?
@common.merge!("#{site["key"]}": reset_site_url(site['url'])) @common.merge!("#{site["key"]}": append_http(reset_site_url(site["url"])))
end end
end end
@ -52,4 +52,8 @@ class SettingsController < ApplicationController
split_arr = url.split('current_user') split_arr = url.split('current_user')
split_arr.length > 1 ? split_arr.join(current_user&.login) : (split_arr << current_user&.login).join('') split_arr.length > 1 ? split_arr.join(current_user&.login) : (split_arr << current_user&.login).join('')
end end
def append_http(url)
url.to_s.start_with?("http") ? url : [request.protocol, request.host_with_port, url].join('')
end
end end