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('
');
<% @orgs_not_in_course.each do |org|%>
diff --git a/app/views/courses/settings/_join_org.html.erb b/app/views/courses/settings/_join_org.html.erb
index 50715f437..cd2d515cc 100644
--- a/app/views/courses/settings/_join_org.html.erb
+++ b/app/views/courses/settings/_join_org.html.erb
@@ -77,7 +77,7 @@
type: "post",
success: function (data) {
$.ajax({
- url: "/courses/" + courseId + "/search_public_orgs_not_in_course",
+ url: "/courses/" + courseId + "/search_public_orgs_not_in_course?hint_flag=true&name=" + $("input[name='orgs']").val().trim(),
type: "get"
});
}
diff --git a/app/views/projects/search_public_orgs_not_in_project.js.erb b/app/views/projects/search_public_orgs_not_in_project.js.erb
index 6599e97f7..c8ac999a1 100644
--- a/app/views/projects/search_public_orgs_not_in_project.js.erb
+++ b/app/views/projects/search_public_orgs_not_in_project.js.erb
@@ -1,9 +1,10 @@
//翻页提醒
-if($("#join_orgs_for_project input:checked").size() > 0)
-{
- alert('翻页或搜索后将丢失当前选择的用户数据!');
-}
-
+<% if @no_roll_hint.nil? %>
+ if( $("#join_orgs_for_project input:checked").size() > 0)
+ {
+ alert('翻页或搜索后将丢失当前选择的用户数据!');
+ }
+<% end %>
$("#search_orgs_result_list").html("");
$("#search_orgs_result_list").append('');
<% @orgs_not_in_project.each do |org|%>
diff --git a/app/views/projects/settings/_join_org.html.erb b/app/views/projects/settings/_join_org.html.erb
index ca3cafed5..8b8425934 100644
--- a/app/views/projects/settings/_join_org.html.erb
+++ b/app/views/projects/settings/_join_org.html.erb
@@ -77,7 +77,7 @@
type: 'post',
success: function (data) {
$.ajax({
- url: '/projects/'+projectId+'/search_public_orgs_not_in_project',
+ url: '/projects/'+projectId+'/search_public_orgs_not_in_project?hint_flag=true&name='+ $("input[name='orgs']").val().trim(),
type: 'get'
});
}
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 5d89e6442..9f1815695 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -1295,7 +1295,7 @@ function cancel_org_course_relation(id, courseId){
type: "delete",
success:function(data){
$.ajax({
- url: "/courses/" + courseId + "/search_public_orgs_not_in_course",
+ url: "/courses/" + courseId + "/search_public_orgs_not_in_course?hint_flag=true",
type:'get'
});
}
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 31d487bd9..f3e6b76ce 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -536,7 +536,7 @@ function cancel_relation(orgId,projectId){
type:'DELETE',
success:function(data) {
$.ajax({
- url: ' /projects/'+projectId+'/search_public_orgs_not_in_project',
+ url: ' /projects/'+projectId+'/search_public_orgs_not_in_project?hint_flag=true',
type:'get'
});
}