diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 6b962e35d..6ffabcbbb 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -553,6 +553,51 @@ end end + # 修改单位名称 + def upload_logo + @menu_type = 6 + @sub_type = 1 + @school = School.find(params[:school]) + apply_schools = ApplyAddSchools.where("status = 0") + apply_school_ids = apply_schools.empty? ? "(-1)" : "(" + apply_schools.map{|sc| sc.school_id}.join(',') + ")" + if !params[:search].nil? + search = "%#{params[:search].to_s.strip.downcase}%" + @schools = School.where("id not in #{apply_school_ids} and #{School.table_name}.name like :p", :p => search) + else + @schools = School.where("id not in #{apply_school_ids}") + end + end + + # 修改单位名称为其他 + def school_upload_logo + school = School.where(:id => params[:applied_id]).first + UserExtensions.where(:school_id => params[:applied_id]).update_all(:school_id => params[:school_id]) + Department.where(:school_id => params[:applied_id]).update_all(:school_id => params[:school_id]) + ApplyAddSchools.where(:school_id => params[:applied_id]).destroy_all + ApplyAddDepartment.where(:school_id => params[:applied_id]).destroy_all + school.destroy + redirect_to departments_part_managements_path + end + + # 修改单位信息 + def school_message_update + school = School.where(:name =>params[:schoolname]).first + school_id = school.id + School.where(:id => school_id).update_all(:province => params[:province],:city =>params[:city],:address => params[:address]) + ApplyAddSchools.where(:school_id => school_id).update_all(:province => params[:province],:city =>params[:city],:address => params[:address]) + redirect_to departments_part_managements_path + end + + # 删除单位 + def delete_school + school = School.where(:id => params[:school]).first + UserExtensions.where(:school_id => params[:school]).update_all(:school_id => nil, :department_id => nil) + ApplyAddSchools.where(:school_id => params[:school]).destroy_all + ApplyAddDepartment.where(:school_id => params[:school]).destroy_all + school.destroy + redirect_to departments_part_managements_path + end + def save_school uploaded_io = params[:logo] sl = School.create(:name => params[:schoolname],:province => params[:province],:city => params[:city],:address => params[:address]) @@ -763,13 +808,12 @@ end if !params[:search].nil? search = "%#{params[:search].to_s.strip.downcase}%" @schools = School.where("id not in #{apply_school_ids} and #{School.table_name}.name like :p", :p => search) - #@schools = School.all else - #@course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id}").select { |course| @user.allowed_to?(:as_teacher,course)} @schools = School.where("id not in #{apply_school_ids}") end @edit_id = params[:school_id] @search = params[:search] + @upload = params[:upload] respond_to do |format| format.js end @@ -888,7 +932,9 @@ end @courses = @courses.joins("join users u on courses.tea_id = u.id").where("concat(u.lastname, u.firstname) like '%#{@search}%'") end else - @courses= @courses.where("name like '%#{@search}%'") + school = School.where("name like '%#{@search}%'").map(&:id) + @courses = @courses.where(:school_id => school) + # @courses= @courses.where("name like '%#{@search}%'") end @courses = @courses.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").reorder("updatetime #{@sx_order}") @export_courses = @courses @@ -1018,7 +1064,7 @@ end # 0 全部；1 活动的； 2 已注册； 3 锁定 def users - @menu_type + @menu_type = 7 @sub_type = 1 status = params[:user_status].nil? ? 0 : params[:user_status].to_i @us_order = params[:us_order].blank? ? "desc" : params[:us_order] # 排序 @@ -1532,7 +1578,7 @@ end @sub_type = 5 @type = trial_authorization_status params[:type] # sql = select * from apply_actions where dealer_id is null - @authorizations = ApplyAction.where(:container_type => "ApplyShixun", :status => @type).order("created_at desc") + @authorizations = ApplyAction.where(:container_type => "ApplyShixun", :status => @type, :dealer_id =>'').order("created_at desc") search = params[:search] unless search.blank? @authorizations = @authorizations.where(:container_id => Shixun.where(:id => @authorizations.map(&:container_id)).where("name like '%#{search}%'").map(&:id)).order("created_at desc") diff --git a/app/views/courses/_course_activity_content.html.erb b/app/views/courses/_course_activity_content.html.erb index 0efd322d4..cc358ea3c 100644 --- a/app/views/courses/_course_activity_content.html.erb +++ b/app/views/courses/_course_activity_content.html.erb @@ -22,9 +22,9 @@ <% end %> <% end %> -
+
新建 -