diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 427295f09..84ffc02e9 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -41,6 +41,7 @@ class ManagementsController < ApplicationController def applicable_course @menu_type = 12 @sub_type = 2 + @major = Major.where(:major_level => 2) @courselist = CourseList.where("0=0") search=params[:search] unless search.blank? @@ -65,9 +66,17 @@ end courselist= CourseList.create(:name => params[:course]) redirect_to applicable_course_managements_path end + + # 增加课程所属专业 def add_major - @major = Major.where("0=0") + + if prams[:major] && params[:major] != 0 + major = MajorCourse.create(:course_list_id=> "15",:major_id => "#{params[:major]}") + end + + redirect_to applicable_course_managements_path end + # 单位部门列表 def departments @menu_type = 6 @@ -722,7 +731,7 @@ end def shixun_authorization @menu_type = 10 - @sub_type == 5 + @sub_type = 5 @type = trial_authorization_status params[:type] @authorizations = ApplyAction.where(:container_type => "ApplyShixun", :status => @type).order("created_at desc") search = params[:search] diff --git a/app/views/managements/_applicable_course_list.html.erb b/app/views/managements/_applicable_course_list.html.erb index 2aa4335bb..537e8025f 100644 --- a/app/views/managements/_applicable_course_list.html.erb +++ b/app/views/managements/_applicable_course_list.html.erb @@ -56,21 +56,33 @@ diff --git a/app/views/managements/_users_authorization_list.html.erb b/app/views/managements/_users_authorization_list.html.erb index e9c9efb35..6860b9568 100644 --- a/app/views/managements/_users_authorization_list.html.erb +++ b/app/views/managements/_users_authorization_list.html.erb @@ -22,7 +22,7 @@