Browse Source

Merge branch 'standalone_develop' into pre_trustie_server

pull/305/head
xiaoxiaoqiong 4 years ago
parent
commit
ffb3b26d3c
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      app/controllers/settings_controller.rb

+ 1
- 1
app/controllers/settings_controller.rb View File

@@ -32,7 +32,7 @@ class SettingsController < ApplicationController

def get_sub_competitions
@sub_competitions = []
Site.competition.pluck(:key).each do |key|
Site.competition.pluck(:key).uniq.each do |key|
hash = {}
hash.merge!("#{key.to_s}": Site.competition.where(key: key).select(:id, :name, :url, :key).to_a.map(&:serializable_hash))
@sub_competitions << hash


Loading…
Cancel
Save