SAK-33876 - Urkund missing link in the student's view (sakaiproject#5258

)
jessicarose · Feb 6, 2018 · 9577c39 · 9577c39
1 parent c9bea20
commit 9577c39
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -1538,6 +1538,7 @@ private String build_student_view_submission_context(VelocityPortlet portlet, Co
 
         context.put("contentTypeImageService", contentTypeImageService);
         context.put("currentTime", Instant.now());
+        context.put("NamePropContentReviewOptoutUrl", ContentReviewConstants.URKUND_OPTOUT_URL);
 
         // SAK-21525 - Groups were not being queried for authz
         boolean allowSubmit = assignmentService.allowAddSubmissionCheckGroups(assignment);

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm
@@ -205,7 +205,7 @@
                                 #if (!$reviewResult.getReviewReport().equals("Error") &&
                                     $reviewResult.contentReviewItem.Properties.get($NamePropContentReviewOptoutUrl))
                                     (<a href="$!reviewResult.contentReviewItem.Properties.get($NamePropContentReviewOptoutUrl)" target="_blank">$tlang.getString("review.report.urkund.optoutlink")</a>)
-                                #end								
+                                #end
                             </div>
                         #end
                         #if ($reviewResults.size() >= 3)

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm
@@ -327,6 +327,10 @@ $(document).ready(function(){
 									#else
 										$validator.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))
 									#end
+									#if (!$reviewResult.getReviewReport().equals("Error") &&
+										$reviewResult.contentReviewItem.Properties.get($NamePropContentReviewOptoutUrl))
+										(<a href="$!reviewResult.contentReviewItem.Properties.get($NamePropContentReviewOptoutUrl)" target="_blank">$tlang.getString("review.report.urkund.optoutlink")</a>)
+									#end
 								</div>
 							#end
 							#if ($reviewResults.size() >= 3)