S2U-34 Fixes

sakaiproject · Oct 6, 2023 · 0d675d4 · 0d675d4
1 parent 9baa8bd
commit 0d675d4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 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
@@ -3839,7 +3839,6 @@ protected String build_instructor_grade_submission_context(VelocityPortlet portl
                 String gradebookUid = toolManager.getCurrentPlacement().getContext();
                 // If the assignment reference is not equal to the associated gradebook item, then a custom gb item is being used
                 if (!assignmentRef.equals(assignmentAssociateGradebook)) {
-                    Optional<org.sakaiproject.grading.api.Assignment> assignmentOptional;
                     try {
                         org.sakaiproject.grading.api.Assignment gbAssignment = gradingService.getAssignment(gradebookUid,
                                 assignmentAssociateGradebook);

diff --git a/rubrics/impl/src/main/java/org/sakaiproject/rubrics/impl/RubricsServiceImpl.java b/rubrics/impl/src/main/java/org/sakaiproject/rubrics/impl/RubricsServiceImpl.java
@@ -873,7 +873,7 @@ public boolean hasAssociatedRubric(String tool, String id) {
 
         if (StringUtils.isBlank(id)) return false;
 
-        return associationRepository.findByToolIdAndItemId(tool, id).filter(canEvaluate.or(canEdit).or(isCreator)).isPresent();
+        return getRubricAssociation(tool, id).isPresent();
     }
 
     public Optional<ToolItemRubricAssociation> saveRubricAssociation(String toolId, String toolItemId, final Map<String, String> params) {
@@ -1015,7 +1015,7 @@ public Optional<ToolItemRubricAssociation> getRubricAssociation(String toolId, S
 
     @Transactional(readOnly = true)
     private Optional<ToolItemRubricAssociation> getRubricAssociationCheckPermission(String toolId, String associatedToolItemId) {
-        return getRubricAssociation(toolId, associatedToolItemId).filter(canEdit.or(isCreator));
+        return getRubricAssociation(toolId, associatedToolItemId).filter(canEdit.or(isCreator).or(canEvaluate));
     }
 
     @Transactional(readOnly = true)

diff --git a/webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubrics-api-mixin.js b/webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubrics-api-mixin.js
@@ -30,14 +30,13 @@ export const rubricsApiMixin = Base => class extends Base {
 
   apiGetEvaluation() {
 
-
-    const url = new URL(`/api/sites/${this.siteId}/rubric-evaluations/tools/${this.toolId}/items/${this.entityId}/evaluations/${this.evaluatedItemId}`);
+    let url = `/api/sites/${this.siteId}/rubric-evaluations/tools/${this.toolId}/items/${this.entityId}/evaluations/${this.evaluatedItemId}/owners/${this.evaluatedItemOwnerId}`;
 
     if (this.isPeerOrSelf) {
-      url.searchParams.append("isPeer", true);
+      url += "?isPeer=true";
     }
 
-    return fetch(url.href, { credentials: "include" })
+    return fetch(url, { credentials: "include" })
       .then(r => {
 
         if (r.ok) {