Merge branch 'standalone_develop' into pre_trustie_server
This commit is contained in:
commit
ffb3b26d3c
|
@ -32,7 +32,7 @@ class SettingsController < ApplicationController
|
||||||
|
|
||||||
def get_sub_competitions
|
def get_sub_competitions
|
||||||
@sub_competitions = []
|
@sub_competitions = []
|
||||||
Site.competition.pluck(:key).each do |key|
|
Site.competition.pluck(:key).uniq.each do |key|
|
||||||
hash = {}
|
hash = {}
|
||||||
hash.merge!("#{key.to_s}": Site.competition.where(key: key).select(:id, :name, :url, :key).to_a.map(&:serializable_hash))
|
hash.merge!("#{key.to_s}": Site.competition.where(key: key).select(:id, :name, :url, :key).to_a.map(&:serializable_hash))
|
||||||
@sub_competitions << hash
|
@sub_competitions << hash
|
||||||
|
|
Loading…
Reference in New Issue