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();