SAK-40426 Assignments / Instructor comments to previous submissions spacing (sakaiproject#5985)

Author: josecebe

assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java

@@ -1055,24 +1055,6 @@ private String fixAssignmentFeedback(String value) {
 
     } // fixAssignmentFeedback
 
-    /**
-     * Apply the fix to pre 1.1.05 assignments submissions feedback.
-     */
-    public static String showPrevFeedback(String value) {
-        if (value == null || value.length() == 0) return value;
-
-        StringBuilder buf = new StringBuilder(value);
-        int pos = -1;
-
-        // <br/> -> \n
-        while ((pos = buf.indexOf("\n")) != -1) {
-            buf.replace(pos, pos + "\n".length(), "<br />");
-        }
-
-        return buf.toString();
-
-    } // showPrevFeedback
-
     public String buildLinkedPanelContext(VelocityPortlet portlet, Context context, RunData data, SessionState state) {
         state.setAttribute(INVOKE, INVOKE_BY_LINK);
         return buildMainPanelContext(portlet, context, data, state);

assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission.vm

@@ -440,7 +440,7 @@
                     $tlang.getString("gradingsub.prefeetex3")
                 </h4>
                 <div class="inlinecoms toggledContent">
-                    $cheffeedbackhelper.showPrevFeedback($cheffeedbackhelper.escapeAssignmentFeedback($!prevFeedbackText))
+                    $cheffeedbackhelper.escapeAssignmentFeedback($!prevFeedbackText)
                 </div>
             #end
 
@@ -724,7 +724,7 @@
                 $tlang.getString("gradingsub.prefee2")
             </h4>
             <div class="gencoms  toggledContent">
-                $cheffeedbackhelper.showPrevFeedback($cheffeedbackhelper.escapeAssignmentFeedback($!prevFeedbackComment))
+                $cheffeedbackhelper.escapeAssignmentFeedback($!prevFeedbackComment)
             </div>
         #end
         <h4>

assignment/tool/src/webapp/vm/assignment/chef_assignments_student_review_edit.vm

@@ -200,7 +200,7 @@
 				#if ($!prevFeedbackText)
 					<h4  id="toggleInline" class="toggleAnchor specialLink"><img alt="expand" class="expand" src="/library/image/sakai/expand.gif" /><img alt="collapse" class="collapse" src="/library/image/sakai/collapse.gif" />$tlang.getString("gradingsub.prefeetex3")</h4>
 					<div class="inlinecoms toggledContent">
-						$cheffeedbackhelper.showPrevFeedback($cheffeedbackhelper.escapeAssignmentFeedback($!prevFeedbackText))
+						$cheffeedbackhelper.escapeAssignmentFeedback($!prevFeedbackText)
 					</div>
 					#end
 

assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm

@@ -487,7 +487,7 @@ $(document).ready(function(){
 								$tlang.getString("gradingsub.prefee2")
 							</h4>
 					<div class="toggledContent gencoms">					
-						$cheffeedbackhelper.showPrevFeedback($cheffeedbackhelper.escapeAssignmentFeedback($!prevFeedbackComment))</div>
+						$cheffeedbackhelper.escapeAssignmentFeedback($!prevFeedbackComment)</div>
 					#end
 					#parse ("/vm/assignment/chef_assignments_student_view_feedback_attachments.vm")
 			#end