app/controllers/manage/stats_controller.rb in hackathon_manager-0.6.1 vs app/controllers/manage/stats_controller.rb in hackathon_manager-0.6.2
- old
+ new
@@ -50,16 +50,19 @@
render json: { data: data }
end
def mlh_info
data = Rails.cache.fetch(cache_key_for_questionnaires("mlh_info")) do
- attributes = [:first_name,
- :last_name,
- :email,
- :phone]
- select_attributes = Array.new(attributes) << :user_id
- data = Questionnaire.select(select_attributes)
- to_json_array(data, attributes)
+ attributes = [
+ :first_name,
+ :last_name,
+ :email,
+ :phone
+ ]
+ select_attributes = Array.new(attributes) << [:user_id, :school_id]
+ json_attribute = Array.new(attributes) << :school_name
+ data = Questionnaire.joins(:school).select(select_attributes)
+ to_json_array(data, json_attribute)
end
render json: { data: data }
end
private