Merge branch 'master' of https://github.com/sakaiproject/sakai

jayrp11 · Aug 30, 2015 · a78783f · a78783f
2 parents 9987eb2 + 181cc52
commit a78783f
Show file tree

Hide file tree

Showing 111 changed files with 5,946 additions and 856 deletions.
diff --git a/assignment/assignment-bundles/resources/assignment.properties b/assignment/assignment-bundles/resources/assignment.properties
@@ -592,7 +592,7 @@ grading.add=Add Assignment to Gradebook
 grading.associate=Associate with existing Gradebook entry
 grading.associate.warn=Sorry! You need to pick a point grade to do this.
 grading.associate.alert=You must select a Gradebook entry.
-grading.select=Select an Assignment
+grading.select=Select a Gradebook Item
 grading.alert.draft.beforeclosedate=The Accept Until Date has not yet passed, and this assignment may still be worked on by the student. Are you sure you want to grade?
 grading.unassigned=Unassigned
 grading.ofcategory=of Category 

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
@@ -10268,13 +10268,13 @@ public void doDelete_assignment(RunData data)
 
 				// remove related announcement if there is one
 				removeAnnouncement(state, pEdit);
-
-				// we use to check "assignment.delete.cascade.submission" setting. But the implementation now is always remove submission objects when the assignment is removed.
-				// delete assignment and its submissions altogether
-				deleteAssignmentObjects(state, aEdit, true);
 
 				// remove from Gradebook
 				integrateGradebook(state, (String) ids.get (i), associateGradebookAssignment, "remove", null, null, -1, null, null, null, -1);
+
+				// we use to check "assignment.delete.cascade.submission" setting. But the implementation now is always remove submission objects when the assignment is removed.
+				// delete assignment and its submissions altogether
+				deleteAssignmentObjects(state, aEdit, true);
 			}
 		} // for
 

diff --git a/assignment/assignment-tool/tool/src/webapp/js/assignments.js b/assignment/assignment-tool/tool/src/webapp/js/assignments.js
@@ -556,7 +556,7 @@ ASN.toggleElements = function( elements, disabled )
 };
 
 // SAK-29314
-ASN.disableControls = function( escape )
+ASN.disableControls = function( escape, linkName )
 {
     // Clone and disable all drop downs (disable the clone, hide the original)
     var dropDowns = ASN.nodeListToArray( document.getElementsByTagName( "select" ) );
@@ -616,6 +616,18 @@ ASN.disableControls = function( escape )
             ASN.disableLink( links[i] );
         }
     }
+
+    if( linkName !== null )
+    {
+        var links = ASN.nodeListToArray( document.getElementsByName( linkName ) );
+        for( i = 0; i < links.length; i++ )
+        {
+            if( links[i] !== null )
+            {
+                ASN.disableLink( links[i] );
+            }
+        }
+    }
 };
 
 // SAK-29314

diff --git a/...ool/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm b/...ool/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm
@@ -57,7 +57,7 @@
 					<input type="hidden" name="eventSubmit_doView" value="view" />
 					<label for="view">$tlang.getString("gen.view2")</label>
 					<span class="skip">$tlang.getString("newassig.selectmessage")</span>
-					<select name="view" id="view" size="1" tabindex="3" onchange="ASN.disableControls();ASN.showSpinner( 'viewSpinner' );document.viewFormList.submit();">
+					<select name="view" id="view" size="1" tabindex="3" onchange="ASN.disableControls( null, 'studentLink' );ASN.showSpinner( 'viewSpinner' );document.viewFormList.submit();">
 						<option value="lisofass1" >$!tlang.getString('lisofass1')</option>
 						<option value="lisofass2" selected="selected" >$!tlang.getString('lisofass2')</option>
 					</select>
@@ -74,7 +74,7 @@
 						</div>
  						<span class="skip">$tlang.getString("newassig.selectmessage")</span>
 
- 						<select id="viewgroup" name="viewgroup" size="1" tabindex="3" onchange="ASN.disableControls();ASN.showSpinner( 'groupSpinner' );blur();document.getElementById('option').value='changeView';document.viewForm.submit();return false;">
+ 						<select id="viewgroup" name="viewgroup" size="1" tabindex="3" onchange="ASN.disableControls( null, 'studentLink' );ASN.showSpinner( 'groupSpinner' );blur();document.getElementById('option').value='changeView';document.viewForm.submit();return false;">
 
 							#if (!$showSubmissionByFilterSearchOnly)
 								<option value="all" #if($!viewGroup.equals("all"))selected="selected"#end >$tlang.getString('gen.viewallgroupssections')</option>
@@ -144,12 +144,12 @@
 							<td headers="studentname" class="specialLink">	
 								<h4>
 								#if (!$studentListShowSet.contains($member.Id))
-									<a href="#" onclick="ASN.disableControls();ASN.showSpinner( 'userSpinner_$member.Id' );location='#toolLinkParam("AssignmentAction" "doShow_student_submission" "studentId=$validator.escapeUrl($member.Id)")'; return false;" 
-											title="$tlang.getString("stulistsunbm.shostuass")">
+									<a href="#" onclick="ASN.disableControls( null, 'studentLink' );ASN.showSpinner( 'userSpinner_$member.Id' );location='#toolLinkParam("AssignmentAction" "doShow_student_submission" "studentId=$validator.escapeUrl($member.Id)")'; return false;" 
+											title="$tlang.getString("stulistsunbm.shostuass")" name="studentLink" >
 										<img src="#imageLink("sakai/expand.gif")" alt="$tlang.getString("stulistsunbm.shostuass")" width="13" height="13" border="0" />
 								#else 
-									<a href="#" onclick="ASN.disableControls();ASN.showSpinner( 'userSpinner_$member.Id' );location='#toolLinkParam("AssignmentAction" "doHide_student_submission" "studentId=$validator.escapeUrl($member.Id)")'; return false;" 
-											title="$tlang.getString("stulistsunbm.hidstuass")">
+									<a href="#" onclick="ASN.disableControls( null, 'studentLink' );ASN.showSpinner( 'userSpinner_$member.Id' );location='#toolLinkParam("AssignmentAction" "doHide_student_submission" "studentId=$validator.escapeUrl($member.Id)")'; return false;" 
+											title="$tlang.getString("stulistsunbm.hidstuass")" name="studentLink" >
 										<img src="#imageLink("sakai/collapse.gif")" alt="$tlang.getString("stulistsunbm.hidstuass")" width="13" height="13" border="0" />
 								#end
 										$submitterName
@@ -183,7 +183,7 @@
 												#if ($allowAddAssignment && $allowSubmitByInstructor)
 												#set( $spinnerID = "submitFor_" + $member.Id + "_" + $validator.escapeUrl($assignment.Reference) )
 												<div class="itemAction">
-													<a onclick="ASN.disableControls();ASN.showSpinner( '$spinnerID' );" href="#toolLinkParam("AssignmentAction" "doView_submission" "assignmentReference=$validator.escapeUrl($assignment.Reference)&submitterId=$validator.escapeUrl($member.id)")">
+													<a onclick="ASN.disableControls( null, 'studentLink' );ASN.showSpinner( '$spinnerID' );" href="#toolLinkParam("AssignmentAction" "doView_submission" "assignmentReference=$validator.escapeUrl($assignment.Reference)&submitterId=$validator.escapeUrl($member.id)")">
 														$tlang.getString("submitforstudent")
 													</a>
 													<img id="$spinnerID" class="spinner" src="/library/image/indicator.gif" />