From b231b44e81f894347a4b5baf9f2ece8717f127a6 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 18 Nov 2015 11:12:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E5=92=8C=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=BF=BB=E9=A1=B5=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=EF=BC=9B=202.=E9=A1=B9=E7=9B=AE=E5=92=8C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=AD=EF=BC=8C=E5=88=A0=E9=99=A4=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E6=97=B6=EF=BC=8C=E7=BB=99=E5=87=BA=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=EF=BC=8C=E7=A1=AE=E8=AE=A4=E6=98=AF=E5=90=A6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/search_public_orgs_not_in_course.js.erb | 4 ++++
 public/javascripts/course.js                              | 1 +
 public/javascripts/project.js                             | 1 +
 3 files changed, 6 insertions(+)

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 76f9bcedb..084583d2a 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,3 +1,7 @@
+if($("#join_orgs_for_course input:checked").size() > 0)
+{
+    alert("翻页或搜索后将丢失当前选择的用户数据");
+}
 $("#search_orgs_result_list").html("");
 $("#search_orgs_result_list").append('<ul class="ml20">');
 <% @orgs_not_in_course.each do |org|%>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 80e39ea4f..5d89e6442 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -1289,6 +1289,7 @@ function course_outline(id){
 
 //取消课程组织关联
 function cancel_org_course_relation(id, courseId){
+    if(confirm("确定取消关联吗？") == false) return;
     $.ajax({
         url:"/org_courses/" + id + "?course_id=" + courseId,
         type: "delete",
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index c3888aec7..31d487bd9 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -530,6 +530,7 @@ function zip(){
 
 //取消关联
 function cancel_relation(orgId,projectId){
+    if(confirm("确定取消关联吗？") == false) return;
     $.ajax({
         url:'/org_projects/'+orgId+"?project_id="+projectId,
         type:'DELETE',