From 5640eae39b9b28459491926c52c02b5c03321c23 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 30 Mar 2015 15:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=BE=E7=A8=8B=E6=88=90?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/members_controller.rb | 3 ++-
 app/views/members/destroy.js.erb      | 4 ++--
 app/views/members/update.js.erb       | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 170e64ef6..078cb1db5 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -314,7 +314,8 @@ class MembersController < ApplicationController
         joined.each do |join|
           join.delete
         end
-
+        @roles = Role.givable.all[3..5]
+        @members = @course.member_principals.includes(:roles, :principal).all.sort
       end
       respond_to do |format|
         format.html { redirect_to_settings_in_courses }
diff --git a/app/views/members/destroy.js.erb b/app/views/members/destroy.js.erb
index 2d0d26271..912cfde58 100644
--- a/app/views/members/destroy.js.erb
+++ b/app/views/members/destroy.js.erb
@@ -1,6 +1,6 @@
   <%if @project%>
-$('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>');
+    $('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>');
   <%elsif @course%>
-  $('#tab-content-members').html('<%= escape_javascript(render :partial => 'courses/settings/members') %>');
+    $('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
   <%end%>
 hideOnLoad();
diff --git a/app/views/members/update.js.erb b/app/views/members/update.js.erb
index c72c16fc5..a166e76ab 100644
--- a/app/views/members/update.js.erb
+++ b/app/views/members/update.js.erb
@@ -1,10 +1,9 @@
 <%if @project%>
 $('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>');
 $("#member-<%= @member.id %>").effect("highlight");
-hideOnLoad();
 <%elsif @course%>
 $('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
-hideOnLoad();
 <%end%>
+hideOnLoad();