mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 13:33:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-55505-master' of git://github.com/abgreeve/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2016-09-12 19:19:45 +02:00
commit 9579b52372
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/assign/locallib.php
View File

@ -3165,9 +3165,9 @@ class assign {
if ($attemptnumber < 0 || $create) {
// Make sure this grade matches the latest submission attempt.
if ($this->get_instance()->teamsubmission) {
$submission = $this->get_group_submission($userid, 0, true);
$submission = $this->get_group_submission($userid, 0, true, $attemptnumber);
} else {
$submission = $this->get_user_submission($userid, true);
$submission = $this->get_user_submission($userid, true, $attemptnumber);
}
if ($submission) {
$attemptnumber = $submission->attemptnumber;

3
mod/assign/tests/behat/edit_previous_feedback.feature
View File

@ -73,6 +73,7 @@ Feature: In an assignment, teachers can edit feedback for a students previous su
Then I log in as "student2"
And I follow "Course 1"
And I follow "Test assignment name"
And I click on ".mod-assign-history-link" "css_element"
And I should see "I'm the teacher second feedback" in the "Feedback comments" "table_row"
And I should see "50.00"
And I click on ".mod-assign-history-link" "css_element"
And I should not see "I'm the teacher second feedback" in the "Feedback comments" "table_row"