Merge remote-tracking branch 'origin/develop' into develop

app/controllers/ec_major_schools_controller.rb

@@ -122,6 +122,7 @@ class EcMajorSchoolsController < ApplicationController
                      requirement_vs_objective_url: "#{requirement_vs_objective_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id)}",
                      requirement_vs_standard: "#{requirement_vs_standard_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id)}",
                      requirement_vs_courses: "#{requirement_vs_courses_ec_major_school_ec_year_path(@year, :ec_major_school_id => @year.ec_major_school_id)}",
+                     students_url: student_lists_ec_major_schools_ec_years_path(@year, ec_major_school_id: @year.ec_major_school_id),
                      go_back_url: ec_major_school_path(major),
                      ec_course_support_setting_url: ec_course_support_setting_url,
                      ec_course_reach_setting_url: ec_course_reach_setting_url,

app/services/copy_ec_year_service.rb

@@ -197,7 +197,7 @@
    def copy_graduation_subitem_course_targets!(target, to_target)
      target.ec_graduation_subitem_course_targets.each do |support|
        to_support = to_target.ec_graduation_subitem_course_targets.new
-       to_support.attributes = support.attributes.except('id', 'ec_graduation_subitem_id', 'created_at', 'updated_at')
+       to_support.attributes = support.attributes.except('id', 'ec_course_target_id', 'ec_graduation_subitem_id', 'created_at', 'updated_at')
        to_support.ec_graduation_subitem_id = graduation_subitem_map[support.ec_graduation_subitem_id]
        to_support.save!
      end