FIX update setting api

This commit is contained in:
jasder 2021-03-23 11:42:22 +08:00
parent ce18cc380a
commit 18ae3853d7
2 changed files with 15 additions and 4 deletions

View File

@ -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

View File

@ -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