From cbeeb84a74c4d180fb5aeb3e88a5abc8787c8d20 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Thu, 19 Sep 2019 16:17:37 +0800 Subject: [PATCH] ecs: fix graduation subitem api order --- app/controllers/ecs/graduation_subitems_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/ecs/graduation_subitems_controller.rb b/app/controllers/ecs/graduation_subitems_controller.rb index b2570891d..03cf379bb 100644 --- a/app/controllers/ecs/graduation_subitems_controller.rb +++ b/app/controllers/ecs/graduation_subitems_controller.rb @@ -1,5 +1,6 @@ class Ecs::GraduationSubitemsController < Ecs::BaseController def index - @graduation_subitems = current_year.ec_graduation_subitems#.reorder('ec_graduation_requirements.position ASC, ec_graduation_subitems.position ASC') + subitems = current_year.ec_graduation_subitems.reorder('ec_graduation_requirements.position ASC, ec_graduation_subitems.position ASC') + @graduation_subitems = subitems.includes(:ec_graduation_requirement) end end \ No newline at end of file