From 0ba1477f1bd86aa3269f6b96ca393bcd58d80994 Mon Sep 17 00:00:00 2001
From: gonglexin <18008490802@163.com>
Date: Tue, 21 Oct 2014 16:51:30 +0800
Subject: [PATCH] =?UTF-8?q?#1360=20=E7=BF=BB=E9=A1=B5=E6=88=96=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=B9=8B=E5=89=8D=E8=8B=A5=E5=B7=B2=E7=BB=8F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BA=86=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E5=88=99?=
 =?UTF-8?q?=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/settings/_members.html.erb | 6 +++++-
 app/views/members/autocomplete.js.erb        | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb
index 5432db8e6..ab0f20257 100644
--- a/app/views/courses/settings/_members.html.erb
+++ b/app/views/courses/settings/_members.html.erb
@@ -82,7 +82,11 @@
             <p style="padding-top: 5px"><%= l(:label_role_plural) %>:
               <% roles.each do |role| %>
 
-                  <label><%= radio_button_tag 'membership[role_ids][]', role.id %> <%= h role %></label>
+                  <% if role.id == 10 %> <!-- 默认学生角色  -->
+                    <label><%= radio_button_tag 'membership[role_ids][]', role.id, true %> <%= h role %></label>
+                  <% else %>
+                    <label><%= radio_button_tag 'membership[role_ids][]', role.id %> <%= h role %></label>
+                  <% end %>
               <% end %></p>
 
             <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
diff --git a/app/views/members/autocomplete.js.erb b/app/views/members/autocomplete.js.erb
index 5ef01c04d..d1e7a884b 100644
--- a/app/views/members/autocomplete.js.erb
+++ b/app/views/members/autocomplete.js.erb
@@ -1,6 +1,11 @@
  <% if @project%>
 $('#principals_for_new_member').html('<%= escape_javascript(render_principals_for_new_members(@project)) %>');
  <% elsif @course%>
+ var checked = $("#principals input:checked").size();
+ if(checked > 0)
+ {
+   alert('翻页或搜索后将丢失当前选择的用户数据!');
+ }
  $('#principals_for_new_member').html('<%= escape_javascript(render_principals_for_new_course_members(@course)) %>');
  <%end%>
  var collection=$("#principals_for_new_member").children("#principals").children("label");