From 18ae3853d76fbb36641f84350b570ed7a5e4961a Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Tue, 23 Mar 2021 11:42:22 +0800
Subject: [PATCH] FIX update setting api

---
 app/controllers/settings_controller.rb | 15 +++++++++++++--
 app/views/settings/show.json.jbuilder  |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 7e5e94d5e..4f4122c00 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -4,8 +4,19 @@ class SettingsController < ApplicationController
     @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects"  if User.current.logged?
 
     @add =  Site.add
-    @personal = User.current.logged? ? Site.personal : []
-
+    @personal =
+      if User.current.logged?
+        arr =[]
+        Site.personal.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
+          hash = {}
+          site.each {|k, v|
+            hash.merge!("#{k}":  v.to_s.include?("current_user") ? v.split('current_user').join(current_user&.login) : v)
+          }
+          arr << hash
+        end
+      else
+        []
+      end
     # @sites = Site.group(:site_type).select(:name, :url, :key)
   end
 end
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder
index 4202283bd..fb03c6377 100644
--- a/app/views/settings/show.json.jbuilder
+++ b/app/views/settings/show.json.jbuilder
@@ -50,9 +50,9 @@ json.setting do
   json.add do
     json.array! @add, :name, :url, :key
   end
-  
+
   json.personal do
-    json.array! @personal, :name, :url, :key
+    json.array! @personal
   end
 
 end