forked from Gitlink/forgeplus
FIX update setting api
This commit is contained in:
parent
ce18cc380a
commit
18ae3853d7
|
@ -4,8 +4,19 @@ class SettingsController < ApplicationController
|
||||||
@old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects" if User.current.logged?
|
@old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects" if User.current.logged?
|
||||||
|
|
||||||
@add = Site.add
|
@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)
|
# @sites = Site.group(:site_type).select(:name, :url, :key)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -50,9 +50,9 @@ json.setting do
|
||||||
json.add do
|
json.add do
|
||||||
json.array! @add, :name, :url, :key
|
json.array! @add, :name, :url, :key
|
||||||
end
|
end
|
||||||
|
|
||||||
json.personal do
|
json.personal do
|
||||||
json.array! @personal, :name, :url, :key
|
json.array! @personal
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue