SAK-29758 assignments -> grade report -> filter by name/id/email does…

…n't work in mixed (anonymous and regular assignments) scenarios
yuyilin · Jul 30, 2015 · cce7f0c · cce7f0c
1 parent e58b5a6
commit cce7f0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...ment/assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/...ment/assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -4860,10 +4860,10 @@ protected String build_instructor_report_submissions(VelocityPortlet portlet, Co
 		List submissions = prepPage( state );
 		context.put("submissions", submissions);
 
+		List<SubmitterSubmission> allSubmissions = (List) state.getAttribute(STATE_PAGEING_TOTAL_ITEMS);
 		boolean hasAtLeastOneAnonAssigment = false;
-		for( Object obj : submissions )
+		for( SubmitterSubmission submission : allSubmissions )
 		{
-			SubmitterSubmission submission = (SubmitterSubmission) obj;
 			Assignment assignment = submission.getSubmission().getAssignment();
 			if( AssignmentService.getInstance().assignmentUsesAnonymousGrading( assignment ) )
 			{

diff --git a/...ment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_report_submissions.vm b/...ment-tool/tool/src/webapp/vm/assignment/chef_assignments_instructor_report_submissions.vm
@@ -46,7 +46,7 @@
 		<div class="navPanel">
 			<div class="viewNav">
 			<br />
-			#if ($!groups.hasNext() || !$hasAtLeastOneAnonAssignment)
+			#if (!$hasAtLeastOneAnonAssignment)
 			<form name="viewForm" class="inlineForm" method="post" action="#toolForm("AssignmentAction")">
 			<input type="hidden" name="option" id="option" value="x" />
 			<input type="hidden" name="eventSubmit_doView_submission_list_option" value="x" />
@@ -72,7 +72,6 @@
 				<p />
 				#end
 
-				#if( !$hasAtLeastOneAnonAssignment )
 				<label for="$form_search" class="skip">$tlang.getString("search")</label>
 				<input value="$validator.escapeHtml($searchString)" placeholder="$tlang.getString( "search_student_instruction" )" 
 					name="search" id="search" type="text" class="searchField" size="20" />
@@ -82,7 +81,6 @@
 				#end
 				<img id="userFilterSpinner" class="spinner" src="/library/image/indicator.gif" />
 				<p />
-				#end
 
 				<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
 			</form>