diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index fd53660c6..cd1de16fc 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -46,6 +46,7 @@ class CoursesController < ApplicationController end # @course_count = Project.course_entities.visible.like(params[:name]).page(params[:page]).count @orgs_page = Paginator.new @org_count, 10,params[:page] + @hint_flag = params[:hint_flag] #render :json => {:orgs => @orgs_not_in_course, :count => @org_count}.to_json respond_to do |format| format.js diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index baa7db060..715f56d3d 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -86,6 +86,7 @@ class ProjectsController < ApplicationController end # @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count @orgs_page = Paginator.new @org_count, 10,params[:page] + @no_roll_hint = params[:hint_flag] #render :json => {:orgs => @orgs_not_in_project, :count => @org_count}.to_json respond_to do |format| format.js diff --git a/app/views/courses/search_public_orgs_not_in_course.js.erb b/app/views/courses/search_public_orgs_not_in_course.js.erb index 084583d2a..2669f8a0f 100644 --- a/app/views/courses/search_public_orgs_not_in_course.js.erb +++ b/app/views/courses/search_public_orgs_not_in_course.js.erb @@ -1,7 +1,9 @@ -if($("#join_orgs_for_course input:checked").size() > 0) -{ - alert("翻页或搜索后将丢失当前选择的用户数据"); -} +<% if @hint_flag.nil? %> + if($("#join_orgs_for_course input:checked").size() > 0) + { + alert("翻页或搜索后将丢失当前选择的用户数据"); + } +<% end %> $("#search_orgs_result_list").html(""); $("#search_orgs_result_list").append('