From 5f5b3805146850e67be3354d6b3b7b1422a93b92 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Wed, 31 Mar 2021 13:35:40 +0800
Subject: [PATCH] FIX conflict

---
 app/controllers/settings_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 638dc4722..03f3c69da 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -22,9 +22,9 @@ class SettingsController < ApplicationController
 
     def get_common_menu
       @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?
-        @common.merge!("#{site["key"]}": reset_site_url(site['url']))
+        @common.merge!("#{site["key"]}": append_http(reset_site_url(site["url"])))
       end
     end
 
@@ -52,4 +52,8 @@ class SettingsController < ApplicationController
      split_arr = url.split('current_user')
      split_arr.length > 1 ? split_arr.join(current_user&.login) : (split_arr << current_user&.login).join('')
    end
+
+   def append_http(url)
+     url.to_s.start_with?("http") ? url : [request.protocol, request.host_with_port, url].join('')
+   end
 end