eh

stgm · Jun 3, 2015 · e1cd48f · e1cd48f
1 parent 1472852
commit e1cd48f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/course_controller.rb b/app/controllers/course_controller.rb
@@ -39,10 +39,10 @@ def change_user_name
 	#
 	def grades_for_group
 		if params[:group].present?
-			@users = Group.find_by_name(params[:group]).users.includes(:submits => [:pset, :grade])
+			@users = Group.find_by_name(params[:group]).users.includes(:submits => [:pset, :grade]).order(:name)
 		else
 			if Group.count > 0
-				@users = Group.order(:name).first.users
+				@users = Group.order(:name).first.users.order(:name)]
 			end
 		end
 		@psets = Pset.order(:order).all

diff --git a/app/views/course/grades.html.erb b/app/views/course/grades.html.erb
@@ -7,7 +7,7 @@
 
 	<div class="tab-content">
 		<section class="tab-pane active">
-			<%= render partial: 'table', locals: { users: @users.order(:name), psets: @psets, schedules: Schedule.all } %>
+			<%= render partial: 'table', locals: { users: @users, psets: @psets, schedules: Schedule.all } %>
 		</section>
 	</div>