SAK-50072 Assignments have grader use correct return url from student…

…s list (#12578)
sakaiproject · May 8, 2024 · 8dbbfc9 · 8dbbfc9
1 parent bbbbfcd
commit 8dbbfc9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -4343,7 +4343,22 @@ protected String build_instructor_grade_submission_context(VelocityPortlet portl
         String toolId = toolManager.getCurrentPlacement().getId();
 
         String template = (String) getContext(data).get("template");
+        if (useSakaiGrader()) {
+            if (MODE_INSTRUCTOR_VIEW_STUDENTS_ASSIGNMENT.equals(state.getAttribute(FROM_VIEW))) {
+                context.put("method", "doView");
+                context.put("urlParams", "view=" + MODE_INSTRUCTOR_VIEW_STUDENTS_ASSIGNMENT);
+            } else {
+                context.put("method", "doGrade_assignment");
+                context.put("urlParams", "assignmentId=" + assignmentRef);
+            }
+            return template + TEMPLATE_INSTRUCTOR_GRADE_SUBMISSION_WITH_GRADER;
+        } else {
+            return template + TEMPLATE_INSTRUCTOR_GRADE_SUBMISSION;
+        }
+
+    } // build_instructor_grade_submission_context
 
+    private boolean useSakaiGrader() {
         boolean useSakaiGrader = serverConfigurationService.getBoolean("assignment.usegraderbydefault", true);
         Preferences prefs = preferencesService.getPreferences(sessionManager.getCurrentSessionUserId());
         ResourceProperties props = prefs.getProperties("viewpreferences");
@@ -4359,14 +4374,8 @@ protected String build_instructor_grade_submission_context(VelocityPortlet portl
                 log.error("Failed to parse assignments view preferences", e);
             }
         }
-
-        if (useSakaiGrader) {
-            return template + TEMPLATE_INSTRUCTOR_GRADE_SUBMISSION_WITH_GRADER;
-        } else {
-            return template + TEMPLATE_INSTRUCTOR_GRADE_SUBMISSION;
-        }
-
-    } // build_instructor_grade_submission_context
+        return useSakaiGrader;
+    }
 
     public class BasicUser {
 
@@ -13587,7 +13596,7 @@ private boolean alertGlobalNavigation(SessionState state, RunData data) {
 
         if (MODE_STUDENT_VIEW_SUBMISSION.equals(mode) || MODE_STUDENT_PREVIEW_SUBMISSION.equals(mode) || MODE_STUDENT_CONFIRM_SUBMISSION.equals(mode)
                 || MODE_STUDENT_VIEW_GRADE.equals(mode) || MODE_INSTRUCTOR_NEW_EDIT_ASSIGNMENT.equals(mode)
-                || MODE_INSTRUCTOR_DELETE_ASSIGNMENT.equals(mode) || MODE_INSTRUCTOR_GRADE_SUBMISSION.equals(mode)
+                || MODE_INSTRUCTOR_DELETE_ASSIGNMENT.equals(mode) || (MODE_INSTRUCTOR_GRADE_SUBMISSION.equals(mode) && !useSakaiGrader())
                 || MODE_INSTRUCTOR_PREVIEW_GRADE_SUBMISSION.equals(mode) || MODE_INSTRUCTOR_PREVIEW_ASSIGNMENT.equals(mode)
                 || MODE_INSTRUCTOR_VIEW_ASSIGNMENT.equals(mode) || MODE_INSTRUCTOR_REORDER_ASSIGNMENT.equals(mode)) {
             if (state.getAttribute(ALERT_GLOBAL_NAVIGATION) == null) {

diff --git a/...ool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission_withgrader.vm b/...ool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission_withgrader.vm
@@ -14,7 +14,7 @@
         tool="assignments"
         gradable-id="$assignment.Id"
         submission-id="$submission.Id"
-        user-list-url="#toolLinkParam("$action" "doGrade_assignment" "assignmentId=$formattedText.escapeUrl($assignmentReference)")"
+        user-list-url="#toolLinkParam("$action" "$method" "$urlParams")"
         current-student-id="$!submitterId"
         has-associated-rubric="$!hasAssociatedRubric"
         #if ($!hasAssociatedRubric)