Merge pull request sakaiproject#858 from steveswinsburg/feature/SAK-2…

…9685_sort_bug SAK-29685 Make sort order consistent and clear
yuyilin · Jul 12, 2015 · 640f6aa · 640f6aa
2 parents e6471b8 + ea7a79d
commit 640f6aa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ice/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java b/...ice/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
@@ -1301,12 +1301,12 @@ public List<org.sakaiproject.service.gradebook.shared.Assignment> getViewableAss
 
 	  // will send back all assignments if user can grade all
 	  if (getAuthz().isUserAbleToGradeAll(gradebookUid)) {
-		  viewableAssignments = getAssignments(gradebook.getId(), SortType.SORT_BY_NONE, true);
+		  viewableAssignments = getAssignments(gradebook.getId(), SortType.SORT_BY_SORTING, true);
 	  } else if (getAuthz().isUserAbleToGrade(gradebookUid)) {
 		  // if user can grade and doesn't have grader perm restrictions, they
 		  // may view all assigns
 		  if (!getAuthz().isUserHasGraderPermissions(gradebookUid)) {
-			  viewableAssignments = getAssignments(gradebook.getId(), null, true);
+			  viewableAssignments = getAssignments(gradebook.getId(), SortType.SORT_BY_SORTING, true);
 		  } else {
 			  // this user has grader perms, so we need to filter the items returned
 			  // if this gradebook has categories enabled, we need to check for category-specific restrictions