forked from Gitlink/forgeplus
ADD common url with setting api
This commit is contained in:
parent
18ae3853d7
commit
815b364428
|
@ -3,7 +3,7 @@ class SettingsController < ApplicationController
|
||||||
@old_projects_url = nil
|
@old_projects_url = nil
|
||||||
@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.select(:id, :name, :url, :key)
|
||||||
@personal =
|
@personal =
|
||||||
if User.current.logged?
|
if User.current.logged?
|
||||||
arr =[]
|
arr =[]
|
||||||
|
@ -17,6 +17,14 @@ class SettingsController < ApplicationController
|
||||||
else
|
else
|
||||||
[]
|
[]
|
||||||
end
|
end
|
||||||
# @sites = Site.group(:site_type).select(:name, :url, :key)
|
|
||||||
|
@common = []
|
||||||
|
Site.common.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)
|
||||||
|
}
|
||||||
|
@common << hash
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -47,6 +47,7 @@ json.setting do
|
||||||
json.new_course default_course_links
|
json.new_course default_course_links
|
||||||
json.old_projects_url @old_projects_url
|
json.old_projects_url @old_projects_url
|
||||||
|
|
||||||
|
|
||||||
json.add do
|
json.add do
|
||||||
json.array! @add, :name, :url, :key
|
json.array! @add, :name, :url, :key
|
||||||
end
|
end
|
||||||
|
@ -55,4 +56,7 @@ json.setting do
|
||||||
json.array! @personal
|
json.array! @personal
|
||||||
end
|
end
|
||||||
|
|
||||||
|
json.common do
|
||||||
|
json.array! @common
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue